rename

BoundaryML · Mar 6, 2024 · b79cc8d · b79cc8d
1 parent 164784a
commit b79cc8d
Show file tree

Hide file tree

Showing 54 changed files with 132 additions and 46 deletions.
diff --git a/engine/Cargo.lock b/engine/Cargo.lock
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -5,7 +5,8 @@ members = [
   "baml-cli",
   "baml-fmt",
   "baml-schema-wasm",
-  "baml-client-lib"
+  "baml-client-lib",
+  "baml-core-ffi",
 ]
 
 [workspace.dependencies]

diff --git a/engine/baml-core-napi/.cargo/config.toml → engine/baml-core-ffi/.cargo/config.toml b/engine/baml-core-napi/.cargo/config.toml → engine/baml-core-ffi/.cargo/config.toml
diff --git a/engine/baml-core-napi/.editorconfig → engine/baml-core-ffi/.editorconfig b/engine/baml-core-napi/.editorconfig → engine/baml-core-ffi/.editorconfig
diff --git a/engine/baml-core-napi/.eslintrc.yml → engine/baml-core-ffi/.eslintrc.yml b/engine/baml-core-napi/.eslintrc.yml → engine/baml-core-ffi/.eslintrc.yml
diff --git a/engine/baml-core-napi/.gitattributes → engine/baml-core-ffi/.gitattributes b/engine/baml-core-napi/.gitattributes → engine/baml-core-ffi/.gitattributes
diff --git a/engine/baml-core-napi/.github/renovate.json → engine/baml-core-ffi/.github/renovate.json b/engine/baml-core-napi/.github/renovate.json → engine/baml-core-ffi/.github/renovate.json
diff --git a/engine/baml-core-napi/.gitignore → engine/baml-core-ffi/.gitignore b/engine/baml-core-napi/.gitignore → engine/baml-core-ffi/.gitignore
diff --git a/engine/baml-core-napi/.husky/.gitignore → engine/baml-core-ffi/.husky/.gitignore b/engine/baml-core-napi/.husky/.gitignore → engine/baml-core-ffi/.husky/.gitignore
diff --git a/engine/baml-core-napi/.husky/pre-commit → engine/baml-core-ffi/.husky/pre-commit b/engine/baml-core-napi/.husky/pre-commit → engine/baml-core-ffi/.husky/pre-commit
diff --git a/engine/baml-core-napi/.prettierignore → engine/baml-core-ffi/.prettierignore b/engine/baml-core-napi/.prettierignore → engine/baml-core-ffi/.prettierignore
diff --git a/engine/baml-core-napi/.taplo.toml → engine/baml-core-ffi/.taplo.toml b/engine/baml-core-napi/.taplo.toml → engine/baml-core-ffi/.taplo.toml
diff --git a/...l-core-napi/.yarn/releases/yarn-4.1.1.cjs → ...ml-core-ffi/.yarn/releases/yarn-4.1.1.cjs b/...l-core-napi/.yarn/releases/yarn-4.1.1.cjs → ...ml-core-ffi/.yarn/releases/yarn-4.1.1.cjs
diff --git a/engine/baml-core-napi/.yarnrc.yml → engine/baml-core-ffi/.yarnrc.yml b/engine/baml-core-napi/.yarnrc.yml → engine/baml-core-ffi/.yarnrc.yml
diff --git a/engine/baml-core-napi/Cargo.toml → engine/baml-core-ffi/Cargo.toml b/engine/baml-core-napi/Cargo.toml → engine/baml-core-ffi/Cargo.toml
diff --git a/engine/baml-core-napi/LICENSE → engine/baml-core-ffi/LICENSE b/engine/baml-core-napi/LICENSE → engine/baml-core-ffi/LICENSE
diff --git a/engine/baml-core-napi/README.md → engine/baml-core-ffi/README.md b/engine/baml-core-napi/README.md → engine/baml-core-ffi/README.md
diff --git a/engine/baml-core-napi/__test__/index.spec.ts → engine/baml-core-ffi/__test__/index.spec.ts b/engine/baml-core-napi/__test__/index.spec.ts → engine/baml-core-ffi/__test__/index.spec.ts
diff --git a/engine/baml-core-napi/benchmark/bench.ts → engine/baml-core-ffi/benchmark/bench.ts b/engine/baml-core-napi/benchmark/bench.ts → engine/baml-core-ffi/benchmark/bench.ts
diff --git a/engine/baml-core-napi/build.rs → engine/baml-core-ffi/build.rs b/engine/baml-core-napi/build.rs → engine/baml-core-ffi/build.rs
diff --git a/engine/baml-core-napi/index.d.ts → engine/baml-core-ffi/index.d.ts b/engine/baml-core-napi/index.d.ts → engine/baml-core-ffi/index.d.ts
diff --git a/engine/baml-core-napi/index.js → engine/baml-core-ffi/index.js b/engine/baml-core-napi/index.js → engine/baml-core-ffi/index.js
@@ -32,24 +32,24 @@ switch (platform) {
   case 'android':
     switch (arch) {
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.android-arm64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.android-arm64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.android-arm64.node')
+            nativeBinding = require('./baml-core.android-arm64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-android-arm64')
+            nativeBinding = require('@boundaryml/baml-core-android-arm64')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.android-arm-eabi.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.android-arm-eabi.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.android-arm-eabi.node')
+            nativeBinding = require('./baml-core.android-arm-eabi.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-android-arm-eabi')
+            nativeBinding = require('@boundaryml/baml-core-android-arm-eabi')
           }
         } catch (e) {
           loadError = e
@@ -62,36 +62,36 @@ switch (platform) {
   case 'win32':
     switch (arch) {
       case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-x64-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-x64-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-x64-msvc.node')
+            nativeBinding = require('./baml-core.win32-x64-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-x64-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-x64-msvc')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'ia32':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-ia32-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-ia32-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-ia32-msvc.node')
+            nativeBinding = require('./baml-core.win32-ia32-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-ia32-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-ia32-msvc')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-arm64-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-arm64-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-arm64-msvc.node')
+            nativeBinding = require('./baml-core.win32-arm64-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-arm64-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-arm64-msvc')
           }
         } catch (e) {
           loadError = e
@@ -102,35 +102,35 @@ switch (platform) {
     }
     break
   case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-universal.node'))
+    localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-universal.node'))
     try {
       if (localFileExisted) {
-        nativeBinding = require('./baml-core-napi.darwin-universal.node')
+        nativeBinding = require('./baml-core.darwin-universal.node')
       } else {
-        nativeBinding = require('@boundaryml/baml-core-napi-darwin-universal')
+        nativeBinding = require('@boundaryml/baml-core-darwin-universal')
       }
       break
     } catch {}
     switch (arch) {
       case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-x64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-x64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.darwin-x64.node')
+            nativeBinding = require('./baml-core.darwin-x64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-darwin-x64')
+            nativeBinding = require('@boundaryml/baml-core-darwin-x64')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-arm64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-arm64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.darwin-arm64.node')
+            nativeBinding = require('./baml-core.darwin-arm64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-darwin-arm64')
+            nativeBinding = require('@boundaryml/baml-core-darwin-arm64')
           }
         } catch (e) {
           loadError = e
@@ -144,12 +144,12 @@ switch (platform) {
     if (arch !== 'x64') {
       throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
     }
-    localFileExisted = existsSync(join(__dirname, 'baml-core-napi.freebsd-x64.node'))
+    localFileExisted = existsSync(join(__dirname, 'baml-core.freebsd-x64.node'))
     try {
       if (localFileExisted) {
-        nativeBinding = require('./baml-core-napi.freebsd-x64.node')
+        nativeBinding = require('./baml-core.freebsd-x64.node')
       } else {
-        nativeBinding = require('@boundaryml/baml-core-napi-freebsd-x64')
+        nativeBinding = require('@boundaryml/baml-core-freebsd-x64')
       }
     } catch (e) {
       loadError = e
@@ -159,23 +159,23 @@ switch (platform) {
     switch (arch) {
       case 'x64':
         if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-x64-musl.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-x64-musl.node')
+              nativeBinding = require('./baml-core.linux-x64-musl.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-x64-musl')
+              nativeBinding = require('@boundaryml/baml-core-linux-x64-musl')
             }
           } catch (e) {
             loadError = e
           }
         } else {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-x64-gnu.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-x64-gnu.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-x64-gnu.node')
+              nativeBinding = require('./baml-core.linux-x64-gnu.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-x64-gnu')
+              nativeBinding = require('@boundaryml/baml-core-linux-x64-gnu')
             }
           } catch (e) {
             loadError = e
@@ -184,36 +184,36 @@ switch (platform) {
         break
       case 'arm64':
         if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm64-musl.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-arm64-musl.node')
+              nativeBinding = require('./baml-core.linux-arm64-musl.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-arm64-musl')
+              nativeBinding = require('@boundaryml/baml-core-linux-arm64-musl')
             }
           } catch (e) {
             loadError = e
           }
         } else {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm64-gnu.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm64-gnu.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-arm64-gnu.node')
+              nativeBinding = require('./baml-core.linux-arm64-gnu.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-arm64-gnu')
+              nativeBinding = require('@boundaryml/baml-core-linux-arm64-gnu')
             }
           } catch (e) {
             loadError = e
           }
         }
         break
       case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm-gnueabihf.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm-gnueabihf.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.linux-arm-gnueabihf.node')
+            nativeBinding = require('./baml-core.linux-arm-gnueabihf.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-linux-arm-gnueabihf')
+            nativeBinding = require('@boundaryml/baml-core-linux-arm-gnueabihf')
           }
         } catch (e) {
           loadError = e

diff --git a/...-core-napi/npm/android-arm-eabi/README.md → ...l-core-ffi/npm/android-arm-eabi/README.md b/...-core-napi/npm/android-arm-eabi/README.md → ...l-core-ffi/npm/android-arm-eabi/README.md
diff --git a/...re-napi/npm/android-arm-eabi/package.json → ...ore-ffi/npm/android-arm-eabi/package.json b/...re-napi/npm/android-arm-eabi/package.json → ...ore-ffi/npm/android-arm-eabi/package.json
diff --git a/...aml-core-napi/npm/android-arm64/README.md → ...baml-core-ffi/npm/android-arm64/README.md b/...aml-core-napi/npm/android-arm64/README.md → ...baml-core-ffi/npm/android-arm64/README.md
diff --git a/...-core-napi/npm/android-arm64/package.json → ...l-core-ffi/npm/android-arm64/package.json b/...-core-napi/npm/android-arm64/package.json → ...l-core-ffi/npm/android-arm64/package.json
diff --git a/...baml-core-napi/npm/darwin-arm64/README.md → .../baml-core-ffi/npm/darwin-arm64/README.md b/...baml-core-napi/npm/darwin-arm64/README.md → .../baml-core-ffi/npm/darwin-arm64/README.md
diff --git a/...l-core-napi/npm/darwin-arm64/package.json → ...ml-core-ffi/npm/darwin-arm64/package.json b/...l-core-napi/npm/darwin-arm64/package.json → ...ml-core-ffi/npm/darwin-arm64/package.json
diff --git a/...e/baml-core-napi/npm/darwin-x64/README.md → ...ne/baml-core-ffi/npm/darwin-x64/README.md b/...e/baml-core-napi/npm/darwin-x64/README.md → ...ne/baml-core-ffi/npm/darwin-x64/README.md
diff --git a/...aml-core-napi/npm/darwin-x64/package.json → ...baml-core-ffi/npm/darwin-x64/package.json b/...aml-core-napi/npm/darwin-x64/package.json → ...baml-core-ffi/npm/darwin-x64/package.json
diff --git a/.../baml-core-napi/npm/freebsd-x64/README.md → ...e/baml-core-ffi/npm/freebsd-x64/README.md b/.../baml-core-napi/npm/freebsd-x64/README.md → ...e/baml-core-ffi/npm/freebsd-x64/README.md
diff --git a/...ml-core-napi/npm/freebsd-x64/package.json → ...aml-core-ffi/npm/freebsd-x64/package.json b/...ml-core-napi/npm/freebsd-x64/package.json → ...aml-core-ffi/npm/freebsd-x64/package.json
diff --git a/...re-napi/npm/linux-arm-gnueabihf/README.md → ...ore-ffi/npm/linux-arm-gnueabihf/README.md b/...re-napi/npm/linux-arm-gnueabihf/README.md → ...ore-ffi/npm/linux-arm-gnueabihf/README.md
diff --git a/...napi/npm/linux-arm-gnueabihf/package.json → ...-ffi/npm/linux-arm-gnueabihf/package.json b/...napi/npm/linux-arm-gnueabihf/package.json → ...-ffi/npm/linux-arm-gnueabihf/package.json
diff --git a/...l-core-napi/npm/linux-arm64-gnu/README.md → ...ml-core-ffi/npm/linux-arm64-gnu/README.md b/...l-core-napi/npm/linux-arm64-gnu/README.md → ...ml-core-ffi/npm/linux-arm64-gnu/README.md
diff --git a/...ore-napi/npm/linux-arm64-gnu/package.json → ...core-ffi/npm/linux-arm64-gnu/package.json b/...ore-napi/npm/linux-arm64-gnu/package.json → ...core-ffi/npm/linux-arm64-gnu/package.json
diff --git a/...-core-napi/npm/linux-arm64-musl/README.md → ...l-core-ffi/npm/linux-arm64-musl/README.md b/...-core-napi/npm/linux-arm64-musl/README.md → ...l-core-ffi/npm/linux-arm64-musl/README.md
diff --git a/...re-napi/npm/linux-arm64-musl/package.json → ...ore-ffi/npm/linux-arm64-musl/package.json b/...re-napi/npm/linux-arm64-musl/package.json → ...ore-ffi/npm/linux-arm64-musl/package.json
diff --git a/...aml-core-napi/npm/linux-x64-gnu/README.md → ...baml-core-ffi/npm/linux-x64-gnu/README.md b/...aml-core-napi/npm/linux-x64-gnu/README.md → ...baml-core-ffi/npm/linux-x64-gnu/README.md
diff --git a/...-core-napi/npm/linux-x64-gnu/package.json → ...l-core-ffi/npm/linux-x64-gnu/package.json b/...-core-napi/npm/linux-x64-gnu/package.json → ...l-core-ffi/npm/linux-x64-gnu/package.json
diff --git a/...ml-core-napi/npm/linux-x64-musl/README.md → ...aml-core-ffi/npm/linux-x64-musl/README.md b/...ml-core-napi/npm/linux-x64-musl/README.md → ...aml-core-ffi/npm/linux-x64-musl/README.md
diff --git a/...core-napi/npm/linux-x64-musl/package.json → ...-core-ffi/npm/linux-x64-musl/package.json b/...core-napi/npm/linux-x64-musl/package.json → ...-core-ffi/npm/linux-x64-musl/package.json
diff --git a/...-core-napi/npm/win32-arm64-msvc/README.md → ...l-core-ffi/npm/win32-arm64-msvc/README.md b/...-core-napi/npm/win32-arm64-msvc/README.md → ...l-core-ffi/npm/win32-arm64-msvc/README.md
diff --git a/...re-napi/npm/win32-arm64-msvc/package.json → ...ore-ffi/npm/win32-arm64-msvc/package.json b/...re-napi/npm/win32-arm64-msvc/package.json → ...ore-ffi/npm/win32-arm64-msvc/package.json
diff --git a/...l-core-napi/npm/win32-ia32-msvc/README.md → ...ml-core-ffi/npm/win32-ia32-msvc/README.md b/...l-core-napi/npm/win32-ia32-msvc/README.md → ...ml-core-ffi/npm/win32-ia32-msvc/README.md
diff --git a/...ore-napi/npm/win32-ia32-msvc/package.json → ...core-ffi/npm/win32-ia32-msvc/package.json b/...ore-napi/npm/win32-ia32-msvc/package.json → ...core-ffi/npm/win32-ia32-msvc/package.json
diff --git a/...ml-core-napi/npm/win32-x64-msvc/README.md → ...aml-core-ffi/npm/win32-x64-msvc/README.md b/...ml-core-napi/npm/win32-x64-msvc/README.md → ...aml-core-ffi/npm/win32-x64-msvc/README.md
diff --git a/...core-napi/npm/win32-x64-msvc/package.json → ...-core-ffi/npm/win32-x64-msvc/package.json b/...core-napi/npm/win32-x64-msvc/package.json → ...-core-ffi/npm/win32-x64-msvc/package.json
diff --git a/engine/baml-core-napi/package.json → engine/baml-core-ffi/package.json b/engine/baml-core-napi/package.json → engine/baml-core-ffi/package.json
@@ -108,4 +108,4 @@
     "arrowParens": "always"
   },
   "packageManager": "[email protected]"
-}
+}
diff --git a/engine/baml-core-napi/rustfmt.toml → engine/baml-core-ffi/rustfmt.toml b/engine/baml-core-napi/rustfmt.toml → engine/baml-core-ffi/rustfmt.toml
diff --git a/engine/baml-core-napi/simple-test.js → engine/baml-core-ffi/simple-test.js b/engine/baml-core-napi/simple-test.js → engine/baml-core-ffi/simple-test.js
diff --git a/engine/baml-core-napi/src/lib.rs → engine/baml-core-ffi/src/lib.rs b/engine/baml-core-napi/src/lib.rs → engine/baml-core-ffi/src/lib.rs
diff --git a/engine/baml-core-napi/tsconfig.json → engine/baml-core-ffi/tsconfig.json b/engine/baml-core-napi/tsconfig.json → engine/baml-core-ffi/tsconfig.json
diff --git a/engine/baml-core-napi/yarn.lock → engine/baml-core-ffi/yarn.lock b/engine/baml-core-napi/yarn.lock → engine/baml-core-ffi/yarn.lock
@@ -84,9 +84,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@boundaryml/baml-core-napi@workspace:.":
+"@boundaryml/baml-core@workspace:.":
   version: 0.0.0-use.local
-  resolution: "@boundaryml/baml-core-napi@workspace:."
+  resolution: "@boundaryml/baml-core@workspace:."
   dependencies:
     "@napi-rs/cli": "npm:^2.16.4"
     "@swc-node/register": "npm:^1.6.8"
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,4 +108,4 @@ @@
         "arrowParens": "always"
       },
       "packageManager": "[email protected]"
-    }
+    }