WIP

Author: GordonSmith

package-lock.json

@@ -103,13 +103,15 @@
     "build-docker-image": "docker build --rm --progress plain -f \"./docker/ubuntu-dev.dockerfile\" -t hpcc-js-wasm-build:latest \".\"",
     "build-docker-wasm": "npx -y mkdirp dist && docker run --rm -it --mount source=\"$(pwd)/dist\",target=/usr/src/app/dist,type=bind,consistency=cached hpcc-js-wasm-build:latest",
     "build-docker": "run-s build-docker-image build-docker-wasm",
+    "build-tests": "esbuild --bundle --platform=node --format=esm --outdir=dist-test src-ts/__tests__/index-node.ts",
+    "build-tests-watch": "npm run build-tests -- --watch",
     "build": "NPM_MODE=Release mkdirp ./lib-esm && run-s compile-cpp compile bundle",
     "build-debug": "NPM_MODE=Debug mkdirp ./lib-esm && run-s compile-cpp compile bundle-debug",
     "standard-version": "standard-version",
     "standard-version-next": "standard-version -p next",
     "standard-version-dryrun": "standard-version --dry-run",
     "git-push": "git push --follow-tags upstream trunk",
-    "watch": "run-p compile-watch bundle-watch",
+    "watch": "run-p compile-watch bundle-watch build-tests-watch",
     "serve-docs": "vitepress serve docs",
     "serve": "ws",
     "lint": "eslint src-ts/**/*.ts",
@@ -121,7 +123,7 @@
     "test-bundle-node": "npx -y esbuild --platform=node --bundle ./dist/base91.js --outdir=tmp",
     "test-chrome": "karma start --single-run --browsers ChromiumHeadless karma.conf.cjs",
     "test-firefox": "karma start --single-run --browsers Firefox karma.conf.cjs",
-    "test-node": "node ./bin/dot-wasm.js -v && mocha ./dist-test/index.node.cjs --reporter spec && mocha ./dist-test/index.node.js --reporter spec",
+    "test-node": "node ./bin/dot-wasm.js -v && mocha ./dist-test/index-node.js --reporter spec && mocha ./dist-test/index-node.js --reporter spec",
     "test": "run-s test-bundle test-bundle-node test-bundle-umd test-chrome test-node",
     "coverage": "nyc npm run test-node",
     "coverage-report": "nyc report --reporter=lcov",
@@ -150,6 +152,7 @@
     "chai": "5.1.0",
     "coveralls": "3.1.1",
     "eslint": "8.57.0",
+    "esbuild": "0.20.2",
     "fzstd": "0.1.1",
     "karma": "6.4.3",
     "karma-chai": "0.1.0",

package.json

@@ -122,10 +122,10 @@ export default args => {
         browserTpl("lib-esm/llama", "dist/llama.umd", "dist/llama"),
         browserTpl("lib-esm/zstd", "dist/zstd.umd", "dist/zstd"),
 
-        browserTpl("lib-esm/__tests__/index-browser", "dist-test/index.umd", "dist-test/index"),
-        nodeTpl("lib-esm/__tests__/index-node", "dist-test/index.node", "dist-test/index.node"),
-        browserTpl("lib-esm/__tests__/worker-browser", "dist-test/worker.umd", "dist-test/worker"),
-        nodeTpl("lib-esm/__tests__/worker-node", "dist-test/worker.node", "dist-test/worker.node"),
+        // browserTpl("lib-esm/__tests__/index-browser", "dist-test/index.umd", "dist-test/index"),
+        // nodeTpl("lib-esm/__tests__/index-node", "dist-test/index.node", "dist-test/index.node"),
+        // browserTpl("lib-esm/__tests__/worker-browser", "dist-test/worker.umd", "dist-test/worker"),
+        // nodeTpl("lib-esm/__tests__/worker-node", "dist-test/worker.node", "dist-test/worker.node"),
 
         binTpl("lib-esm/__bin__/dot-wasm", "bin/dot-wasm.js"),
     ];

rollup.config.js

@@ -1,7 +1,7 @@
 #include <string>
 #include <base91.hpp>
 
-const char *const version = "0.6.0";
+const char *const version = "0.6.0.1";
 
 class CBasE91
 {

src-cpp/base91/main.cpp

@@ -1,6 +1,6 @@
 project(llamalib)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 find_package(Llama CONFIG REQUIRED)
 

src-cpp/llama/CMakeLists.txt

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-int simple(int argc, char **argv)
+int simple(int argc, const char **argv)
 {
     gpt_params params;
 
@@ -214,6 +214,14 @@ struct llama
     {
         ::free(__ptr);
     }
+
+    static void test()
+    {
+        std::cout << "Hello" << std::endl;
+        int argc = 2;
+        const char *argv[] = {"tinyllama-1.1b-1t-openorca.Q4_K_M.gguf", "Who are you?"};
+        simple(argc, argv);
+    }
 };
 
 //  Include JS Glue  ---

src-cpp/llama/main.cpp

@@ -4,4 +4,6 @@ interface llama
 
     static any malloc(unsigned long size);
     static void free(any ptr);
+
+    static void test();
 };

src-cpp/llama/main.idl

@@ -1,7 +1,7 @@
 import { expect } from "chai";
-import { Llama } from "@hpcc-js/wasm/llama";
+import { Llama } from "../llama";
 
-describe("llama", function () {
+describe.only("llama", function () {
     it("version", async function () {
         let llama = await Llama.load();
         let v = llama.version();
@@ -21,4 +21,8 @@ describe("llama", function () {
         Llama.unload();
     });
 
+    it.skip("test", async function () {
+        let llama = await Llama.load();
+        llama.test();
+    });
 });

src-ts/__tests__/llama.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { loadWasm, unloadWasm } from "./llamalib.wasm.js";
+import { loadWasm, unloadWasm } from "../lib-esm/llamalib.wasm.js";
 import { WasmLibrary } from "./wasm-library.js";
 
 //  Ref:  http://facebook.github.io/llama/llama_manual.html
@@ -61,4 +61,11 @@ export class Llama extends WasmLibrary {
     version(): string {
         return this._exports.version();
     }
+
+    /**
+     * @returns The Llama c++ test
+     */
+    test() {
+        this._exports.test();
+    }
 }