@voxgig/create-sdkgen 0.0.1 → 0.0.2

package/README.md

@@ -1,2 +1,4 @@
 # create-sdkgen
 Create a Voxgig SDK Generator project
+
+

package/bin/run-create-sdkgen.js

@@ -1,5 +1,269 @@
 #!/usr/bin/env node
 
+const Path = require('node:path')
+const { statSync } = require('node:fs')
+const { parseArgs } = require('node:util')
+
+const { Gubu, Fault } = require('gubu')
+
+const Pkg = require('../package.json')
+
 const { CreateSdkGen } = require('../dist/create-sdkgen.js') 
 
-console.log('CreateSdkGen', CreateSdkGen)
+// const { Root } = require('../dist/standard/Root')
+const rootpath = require.resolve('../dist/standard/Root')
+
+let DEBUG = false
+let CONSOLE = console
+
+
+try {
+  let options = resolveOptions()
+
+  if(options.debug) {
+    DEBUG = true
+  }
+
+  if(options.version) {
+    version()
+  }
+
+  if(options.help) {
+    help()
+  }
+
+  if(options.version || options.help) {
+    exit()
+  }
+
+  options = validateOptions(options)
+
+  generate(options)
+  
+}
+catch(err) {
+  handleError(err)
+}
+
+
+
+function exit(err) {
+  let code = 0
+  if(err) {
+    code = 1
+  }
+  process.exit(code)
+}
+
+
+function generate(options) {
+  const createSdkGen = CreateSdkGen({
+    folder: options.folder,
+    rootpath
+  })
+
+
+  // TODO: load model
+  
+  const model = {
+    name: options.name,
+    year: new Date().getFullYear(),
+    def: {
+      filepath: options.def || 'def.yml'
+    }
+  }
+
+  model.def.filename = Path.basename(model.def.filepath) 
+  
+  const spec = {
+    // TODO: move to CreateSdkGen options
+    spec: options.spec,
+    model,
+    // root: Root,
+  }
+  
+  if(options.watch) {
+    spec.watch = [
+      '../tm',
+      '../dist',
+    ]
+    createSdkGen.watch(spec)
+  }
+  else {
+    createSdkGen.generate(spec)
+  }
+
+}
+
+
+function resolveOptions() {
+
+  const args = parseArgs({
+    allowPositionals: true,
+    options: {
+      folder: {
+        type: 'string',
+        short: 'f',
+        default: '',
+      },
+      
+      def: {
+        type: 'string',
+        short: 'd',
+        default: '',
+      },
+      
+      model: {
+        type: 'string',
+        short: 'm',
+        default: '',
+      },
+      
+      watch: {
+        type: 'boolean',
+        short: 'w',
+      },
+      
+      debug: {
+        type: 'boolean',
+        short: 'g',
+      },
+      
+      help: {
+        type: 'boolean',
+        short: 'h',
+      },
+      
+      version: {
+        type: 'boolean',
+        short: 'v',
+      },
+      
+    }
+  })
+
+  const options = {
+    name: args.positionals[0],
+    folder: '' === args.values.folder ? args.positionals[0] : args.values.folder,
+    def: args.values.def,
+    model: args.values.model,
+    watch: !!args.values.watch,
+    debug: !!args.values.debug,
+    help: !!args.values.help,
+    version: !!args.values.version,
+  }
+
+  return options
+}
+
+
+function validateOptions(rawOptions) {
+  const optShape = Gubu({
+    name: Fault('The first argument should be the project name.', String),
+    folder: String,
+    def: '',
+    model: '',
+    watch: Boolean,
+    debug: Boolean,
+    help: Boolean,
+    version: Boolean,
+  })
+
+  const err = []
+  const options = optShape(rawOptions,{err})
+
+  if(err[0]) {
+    throw new Error(err[0].text)
+  }
+
+  if('' !== options.def) {
+    options.def = Path.resolve(options.def)
+    const stat = statSync(options.def, {throwIfNoEntry:false})
+    if(null == stat) {
+      throw new Error('Definition file not found: '+options.def)
+    }
+  }
+
+  if('' !== options.model) {
+    options.model = Path.resolve(options.model)
+    const stat = statSync(options.model, {throwIfNoEntry:false})
+    if(null == stat) {
+      throw new Error('Model file not found: '+options.model)
+    }
+  }
+
+  return options
+}
+
+
+function handleError(err) {
+  CONSOLE.log('Voxgig SDK Generator Error:')
+
+  if(DEBUG) {
+    CONSOLE.log(err)
+  }
+  else {
+    CONSOLE.log(err.message)
+  }
+  
+  exit(err)
+}
+
+
+function version() {
+  CONSOLE.log(Pkg.version)
+}
+
+
+function help() {
+  let s = `
+Create a Voxgig SDK Generator project.
+
+Usage: npm create @voxgig/sdkgen@latest <name> <args> 
+
+  where <name> is the name of the SDK project. This is also used to
+    create a project folder if one is not explictly defined using the -f
+    argument. If run against an existing folder generated files will be
+    overwritten.
+
+  <args> are the command arguments:
+
+    --folder <folder>      Specific the folder for the SDK project. Optional.
+    -f <folder>              Default: <name> in current folder.
+
+    --def <file>           Specify the API definition file (OpenAPI, Swagger, etc)
+    -d                       that defines the SDK. Optional.
+
+    --model <file>         Specify the SDK model file to customize the SDK. Optional.
+    -m                       
+
+    --watch                Run in watch mode. The SDK project will be updated if any of the
+    -w                       project inputs (such as the spec file) change.
+
+    --debug                Print verbose logging.
+    -d                       
+
+    --help                 Print this help message.
+    -h
+
+    --version              Print version number.
+    -v
+
+
+Examples:
+
+# Basic usage
+> npm create @voxgig/sdkgen@latest foo
+# Creates the SDK Project in the folder ./foo
+
+
+# Custom project folder
+> npm create @voxgig/sdkgen@latest foo -f ~/Projects/Foo
+# Creates the SDK Project in the folder ~/Projects/Foo
+
+
+See also: https://voxgig.com/sdkgen
+`
+
+  CONSOLE.log(s)
+}

package/dist/create-sdkgen.d.ts

@@ -3,10 +3,12 @@ type FullCreateSdkGenOptions = {
     fs: any;
     model: any;
     meta: any;
+    rootpath: string;
 };
 type CreateSdkGenOptions = Partial<FullCreateSdkGenOptions>;
 declare function CreateSdkGen(opts: CreateSdkGenOptions): {
     generate: (spec: any) => Promise<void>;
+    watch: (spec: any) => Promise<void>;
 };
 export type { CreateSdkGenOptions, };
 export { CreateSdkGen, };

package/dist/create-sdkgen.js

@@ -26,25 +26,74 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateSdkGen = CreateSdkGen;
 const Fs = __importStar(require("node:fs"));
+const chokidar_1 = require("chokidar");
 const JostracaModule = __importStar(require("jostraca"));
 const { Jostraca } = JostracaModule;
 function CreateSdkGen(opts) {
     const fs = opts.fs || Fs;
     const folder = opts.folder || '.';
     const jostraca = Jostraca();
+    const rootpath = opts.rootpath;
     async function generate(spec) {
-        const { model, root } = spec;
+        // console.log('CreateSdkGen.generate', spec)
+        const { model } = spec;
         const ctx$ = { fs, folder, meta: { spec } };
+        clear();
+        const { Root } = require(rootpath);
         try {
-            jostraca.generate(ctx$, () => root({ model }));
+            await jostraca.generate(ctx$, () => Root({ model }));
         }
         catch (err) {
             console.log('CREATE SDKGEN ERROR: ', err);
             throw err;
         }
     }
+    async function watch(spec) {
+        const fsw = new chokidar_1.FSWatcher();
+        let last_change_time = 0;
+        await generate(spec);
+        fsw.on('change', (args) => {
+            // console.log('CHANGE', args)
+            const dorun = 1111 < Date.now() - last_change_time;
+            if (dorun) {
+                last_change_time = Date.now();
+                generate(spec);
+            }
+        });
+        spec.watch
+            .map((wf) => (__dirname + '/' + wf))
+            // .map((wf: string) => (console.log(wf), wf))
+            .map((wf) => fsw.add(wf));
+        // generate()
+    }
+    function clear() {
+        if (rootpath) {
+            clearRequire(rootpath);
+        }
+    }
     return {
         generate,
+        watch,
     };
 }
+// Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
+function clearRequire(path) {
+    let filePath = require.resolve(path);
+    if (require.cache[filePath]) {
+        const children = require.cache[filePath].children.map(child => child.id);
+        // Delete module from cache
+        delete require.cache[filePath];
+        for (const id of children) {
+            clearRequire(id);
+        }
+    }
+    if (require.cache[filePath] && require.cache[filePath].parent) {
+        let i = require.cache[filePath].parent.children.length;
+        while (i--) {
+            if (require.cache[filePath].parent.children[i].id === filePath) {
+                require.cache[filePath].parent.children.splice(i, 1);
+            }
+        }
+    }
+}
 //# sourceMappingURL=create-sdkgen.js.map

package/dist/create-sdkgen.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-sdkgen.js","sourceRoot":"","sources":["../src/create-sdkgen.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;;;;;;;;;;;;;;;;;;;;AA2DlD,oCAAY;AAzDd,4CAA6B;AAG7B,yDAA0C;AAc1C,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;AAGnC,SAAS,YAAY,CAAC,IAAyB;IAC7C,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;IACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAA;IACjC,MAAM,QAAQ,GAAG,QAAQ,EAAE,CAAA;IAG3B,KAAK,UAAU,QAAQ,CAAC,IAAS;QAC/B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAE5B,MAAM,IAAI,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAA;QAE3C,IAAI,CAAC;YACH,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAA;YACzC,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAGD,OAAO;QACL,QAAQ;KACT,CAAA;AAEH,CAAC"}
+{"version":3,"file":"create-sdkgen.js","sourceRoot":"","sources":["../src/create-sdkgen.ts"],"names":[],"mappings":"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"}

package/dist/standard/ModelSdk.d.ts

@@ -0,0 +1,2 @@
+declare const ModelSdk: import("jostraca").Component;
+export { ModelSdk };

package/dist/standard/ModelSdk.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelSdk = void 0;
+const jostraca_1 = require("jostraca");
+const ModelSdk = (0, jostraca_1.cmp)(function ModelSdk(props) {
+    const { ctx$, ctx$: { model } } = props;
+    // console.log('ModelSdk 2', model)
+    // TODO: use apidef
+    // const def = ctx$.fs.readFileSync(model.def.filepath)
+    (0, jostraca_1.File)({ name: 'sdk.jsonic' }, () => {
+        (0, jostraca_1.Content)(`
+name: '${model.name}'
+
+@"api.jsonic"
+@"def.jsonic"
+
+main: sdk: build: &: { name: .$KEY }
+
+main: sdk: build: js: @"js.jsonic"
+
+main: sdk: build: rb: @"rb.jsonic"
+
+main: sdk: build: py: @"py.jsonic"
+
+main: sdk: build: php: @"php.jsonic"
+
+main: sdk: build: go: @"go.jsonic"
+
+
+
+main: sdk: test: quick: entity: name: q
+
+
+main: sdk: entity: $.main.api.entity
+
+
+main: sdk: entity: &: {
+  name: .$KEY
+  publish: *true | boolean
+}
+
+
+
+main: sdk: options: &: {
+   name: .$KEY
+   publish: *true | boolean
+}
+
+
+main: sdk: options: {
+
+  endpoint: {
+    kind: *String | string
+    short: "${model.Name} API URL"
+  }
+
+  apikey: {
+    kind: *String | string
+    short: "${model.Name} API Key"
+  }
+  
+  fetch: {
+    kind: *Any | string
+    publish: false
+  }
+}
+`);
+    });
+});
+exports.ModelSdk = ModelSdk;
+//# sourceMappingURL=ModelSdk.js.map

package/dist/standard/ModelSdk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelSdk.js","sourceRoot":"","sources":["../../src/standard/ModelSdk.ts"],"names":[],"mappings":";;;AACA,uCAWiB;AAIjB,MAAM,QAAQ,GAAG,IAAA,cAAG,EAAC,SAAS,QAAQ,CAAC,KAAU;IAC/C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,KAAK,CAAA;IAGvC,mCAAmC;IAEnC,mBAAmB;IACnB,uDAAuD;IAGvD,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,GAAG,EAAE;QAChC,IAAA,kBAAO,EAAC;SACH,KAAK,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA0CL,KAAK,CAAC,IAAI;;;;;cAKV,KAAK,CAAC,IAAI;;;;;;;;CAQvB,CAAC,CAAA;IACA,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;AAIA,4BAAQ"}

package/dist/standard/Root.d.ts

@@ -0,0 +1,2 @@
+declare const Root: import("jostraca").Component;
+export { Root };

package/dist/standard/Root.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Root = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const jostraca_1 = require("jostraca");
+const ModelSdk_1 = require("./ModelSdk");
+const Root = (0, jostraca_1.cmp)(function Root(props) {
+    const { model, ctx$ } = props;
+    const { folder, meta } = ctx$;
+    const { spec } = meta;
+    console.log('Root 5');
+    // console.log('SPEC', spec)
+    (0, jostraca_1.names)(model, model.name);
+    // console.log('MODEL')
+    // console.dir(model, { depth: null })
+    ctx$.model = model;
+    /*
+    let createInfo = { exclude: [], last: Number.MAX_SAFE_INTEGER }
+  
+  
+    try {
+      createInfo = JSON.parse(ctx$.fs.readFileSync(
+        Path.join(folder, '.voxgig', 'create-sdkgen.json'), 'utf8'))
+    }
+    catch (err: any) {
+      console.log(err)
+      // TODO: file not foound ignored, handle others!
+    }
+  
+    ctx$.info = createInfo
+  
+    console.log('INFO', ctx$.info)
+    */
+    (0, jostraca_1.Project)({ folder }, () => {
+        // TODO: perhaps remove the need for this, create top level folder in Project
+        // would keep paths indo of project folder name
+        // Folder({ name: Path.basename(folder) }, () => {
+        // File({ name: 'foo.txt' }, () => {
+        //   Content('FOO')
+        // })
+        // console.log('FOLDER', folder)
+        (0, jostraca_1.Copy)({ from: __dirname + '/../../tm/standard' });
+        const def = model.def.filepath;
+        if (null != def && '' !== def) {
+            (0, jostraca_1.Folder)({ name: 'def' }, () => {
+                (0, jostraca_1.Copy)({ from: def, name: node_path_1.default.basename(def) });
+            });
+        }
+        (0, jostraca_1.Folder)({ name: '.voxgig' }, () => { });
+        (0, jostraca_1.Folder)({ name: 'model' }, () => {
+            (0, ModelSdk_1.ModelSdk)({});
+        });
+    });
+    /*
+    // TODO: need mechanism to ensure this is last
+    setTimeout(() => {
+      try {
+        const info = {
+          last: Date.now(),
+          exclude: ctx$.info.exclude,
+        }
+        ctx$.fs.writeFileSync(Path.join(folder, '.voxgig', 'create-sdkgen.json'),
+          JSON.stringify(info, null, 2))
+      }
+      catch (err: any) {
+        console.log(err)
+        // TODO: file not foound ignored, handle others!
+      }
+      }, 777)
+      */
+});
+exports.Root = Root;
+//# sourceMappingURL=Root.js.map

package/dist/standard/Root.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Root.js","sourceRoot":"","sources":["../../src/standard/Root.ts"],"names":[],"mappings":";;;;;;AAEA,0DAA4B;AAG5B,uCAWiB;AAGjB,yCAAqC;AAGrC,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,SAAS,IAAI,CAAC,KAAU;IACvC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAE7B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IAErB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAErB,4BAA4B;IAE5B,IAAA,gBAAK,EAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;IAExB,uBAAuB;IACvB,sCAAsC;IAEtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IAElB;;;;;;;;;;;;;;;;MAgBE;IAEF,IAAA,kBAAO,EAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE;QAEvB,6EAA6E;QAC7E,+CAA+C;QAC/C,kDAAkD;QAElD,oCAAoC;QACpC,mBAAmB;QACnB,KAAK;QAEL,gCAAgC;QAChC,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,SAAS,GAAG,oBAAoB,EAAE,CAAC,CAAA;QAEhD,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAA;QAC9B,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YAC9B,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE;gBAC3B,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,mBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/C,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QAEtC,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE;YAC7B,IAAA,mBAAQ,EAAC,EAAE,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF;;;;;;;;;;;;;;;;QAgBI;AACN,CAAC,CAAC,CAAA;AAIA,oBAAI"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/create-sdkgen.ts","../src/utility.ts"],"version":"5.6.2"}
+{"root":["../src/create-sdkgen.ts","../src/utility.ts","../src/standard/modelsdk.ts","../src/standard/root.ts"],"version":"5.6.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/create-sdkgen",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "dist/create-sdkgen.js",
   "type": "commonjs",
   "types": "dist/create-sdkgen.d.ts",
@@ -38,14 +38,15 @@
   ],
   "devDependencies": {
     "@hapi/code": "^9.0.3",
-    "@types/node": "22.5.4",
+    "@types/node": "22.5.5",
     "esbuild": "^0.23.1",
-    "memfs": "^4.11.1",
-    "typescript": "^5.5.4"
+    "memfs": "^4.12.0",
+    "typescript": "^5.6.2"
   },
   "dependencies": {
     "aontu": "^0.22.0",
-    "jostraca": "^0.4.0"
+    "chokidar": "^4.0.0",
+    "gubu": "^8.3.0",
+    "jostraca": "^0.6.0"
   }
 }
-

package/src/create-sdkgen.ts

@@ -2,6 +2,7 @@
 
 import * as Fs from 'node:fs'
 
+import { FSWatcher } from 'chokidar'
 
 import * as JostracaModule from 'jostraca'
 
@@ -12,6 +13,7 @@ type FullCreateSdkGenOptions = {
   fs: any
   model: any
   meta: any
+  rootpath: string
 }
 
 type CreateSdkGenOptions = Partial<FullCreateSdkGenOptions>
@@ -24,15 +26,20 @@ function CreateSdkGen(opts: CreateSdkGenOptions) {
   const fs = opts.fs || Fs
   const folder = opts.folder || '.'
   const jostraca = Jostraca()
-
+  const rootpath = opts.rootpath as string
 
   async function generate(spec: any) {
-    const { model, root } = spec
+    // console.log('CreateSdkGen.generate', spec)
+
+    const { model } = spec
 
     const ctx$ = { fs, folder, meta: { spec } }
 
+    clear()
+    const { Root } = require(rootpath)
+
     try {
-      jostraca.generate(ctx$, () => root({ model }))
+      await jostraca.generate(ctx$, () => Root({ model }))
     }
     catch (err: any) {
       console.log('CREATE SDKGEN ERROR: ', err)
@@ -41,13 +48,74 @@ function CreateSdkGen(opts: CreateSdkGenOptions) {
   }
 
 
+  async function watch(spec: any) {
+    const fsw = new FSWatcher()
+    let last_change_time = 0
+
+    await generate(spec)
+
+    fsw.on('change', (args: any[]) => {
+      // console.log('CHANGE', args)
+
+      const dorun = 1111 < Date.now() - last_change_time
+
+      if (dorun) {
+        last_change_time = Date.now()
+        generate(spec)
+      }
+    })
+
+    spec.watch
+      .map((wf: string) => (__dirname + '/' + wf))
+      // .map((wf: string) => (console.log(wf), wf))
+      .map((wf: string) => fsw.add(wf))
+
+    // generate()
+  }
+
+
+  function clear() {
+    if (rootpath) {
+      clearRequire(rootpath)
+    }
+  }
+
+
   return {
     generate,
+    watch,
   }
 
 }
 
 
+// Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
+function clearRequire(path: string) {
+  let filePath = require.resolve(path)
+
+  if (require.cache[filePath]) {
+    const children = require.cache[filePath].children.map(child => child.id)
+
+    // Delete module from cache
+    delete require.cache[filePath]
+
+    for (const id of children) {
+      clearRequire(id)
+    }
+  }
+
+
+  if (require.cache[filePath] && require.cache[filePath].parent) {
+    let i = require.cache[filePath].parent.children.length
+
+    while (i--) {
+      if (require.cache[filePath].parent.children[i].id === filePath) {
+        require.cache[filePath].parent.children.splice(i, 1)
+      }
+    }
+  }
+
+}
 
 
 export type {

package/src/standard/ModelSdk.ts

@@ -0,0 +1,92 @@
+
+import {
+  names,
+  cmp,
+  each,
+
+  Project,
+  Folder,
+  Copy,
+  File,
+  Content,
+
+} from 'jostraca'
+
+
+
+const ModelSdk = cmp(function ModelSdk(props: any) {
+  const { ctx$, ctx$: { model } } = props
+
+
+  // console.log('ModelSdk 2', model)
+
+  // TODO: use apidef
+  // const def = ctx$.fs.readFileSync(model.def.filepath)
+
+
+  File({ name: 'sdk.jsonic' }, () => {
+    Content(`
+name: '${model.name}'
+
+@"api.jsonic"
+@"def.jsonic"
+
+main: sdk: build: &: { name: .$KEY }
+
+main: sdk: build: js: @"js.jsonic"
+
+main: sdk: build: rb: @"rb.jsonic"
+
+main: sdk: build: py: @"py.jsonic"
+
+main: sdk: build: php: @"php.jsonic"
+
+main: sdk: build: go: @"go.jsonic"
+
+
+
+main: sdk: test: quick: entity: name: q
+
+
+main: sdk: entity: $.main.api.entity
+
+
+main: sdk: entity: &: {
+  name: .$KEY
+  publish: *true | boolean
+}
+
+
+
+main: sdk: options: &: {
+   name: .$KEY
+   publish: *true | boolean
+}
+
+
+main: sdk: options: {
+
+  endpoint: {
+    kind: *String | string
+    short: "${model.Name} API URL"
+  }
+
+  apikey: {
+    kind: *String | string
+    short: "${model.Name} API Key"
+  }
+  
+  fetch: {
+    kind: *Any | string
+    publish: false
+  }
+}
+`)
+  })
+
+})
+
+
+export {
+  ModelSdk
+}

package/src/standard/ModelSdk.ts~

@@ -0,0 +1 @@
+

package/src/standard/Root.ts

@@ -0,0 +1,107 @@
+
+
+import Path from 'node:path'
+
+
+import {
+  names,
+  cmp,
+  each,
+
+  Project,
+  Folder,
+  Copy,
+  File,
+  Content,
+
+} from 'jostraca'
+
+
+import { ModelSdk } from './ModelSdk'
+
+
+const Root = cmp(function Root(props: any) {
+  const { model, ctx$ } = props
+
+  const { folder, meta } = ctx$
+  const { spec } = meta
+
+  console.log('Root 5')
+
+  // console.log('SPEC', spec)
+
+  names(model, model.name)
+
+  // console.log('MODEL')
+  // console.dir(model, { depth: null })
+
+  ctx$.model = model
+
+  /*
+  let createInfo = { exclude: [], last: Number.MAX_SAFE_INTEGER }
+
+
+  try {
+    createInfo = JSON.parse(ctx$.fs.readFileSync(
+      Path.join(folder, '.voxgig', 'create-sdkgen.json'), 'utf8'))
+  }
+  catch (err: any) {
+    console.log(err)
+    // TODO: file not foound ignored, handle others!
+  }
+
+  ctx$.info = createInfo
+
+  console.log('INFO', ctx$.info)
+  */
+
+  Project({ folder }, () => {
+
+    // TODO: perhaps remove the need for this, create top level folder in Project
+    // would keep paths indo of project folder name
+    // Folder({ name: Path.basename(folder) }, () => {
+
+    // File({ name: 'foo.txt' }, () => {
+    //   Content('FOO')
+    // })
+
+    // console.log('FOLDER', folder)
+    Copy({ from: __dirname + '/../../tm/standard' })
+
+    const def = model.def.filepath
+    if (null != def && '' !== def) {
+      Folder({ name: 'def' }, () => {
+        Copy({ from: def, name: Path.basename(def) })
+      })
+    }
+
+    Folder({ name: '.voxgig' }, () => { })
+
+    Folder({ name: 'model' }, () => {
+      ModelSdk({})
+    })
+  })
+
+  /*
+  // TODO: need mechanism to ensure this is last
+  setTimeout(() => {
+    try {
+      const info = {
+        last: Date.now(),
+        exclude: ctx$.info.exclude,
+      }
+      ctx$.fs.writeFileSync(Path.join(folder, '.voxgig', 'create-sdkgen.json'),
+        JSON.stringify(info, null, 2))
+    }
+    catch (err: any) {
+      console.log(err)
+      // TODO: file not foound ignored, handle others!
+    }
+    }, 777)
+    */
+})
+
+
+export {
+  Root
+}

package/src/standard/Root.ts~

@@ -0,0 +1,3 @@
+
+
+