@voxgig/create-sdkgen 0.0.3 → 0.0.5

package/bin/run-create-sdkgen.js

@@ -5,6 +5,8 @@ const { statSync } = require('node:fs')
 const { parseArgs } = require('node:util')
 
 const { Gubu, Fault } = require('gubu')
+const { Aontu, Context } = require('aontu')
+
 
 const Pkg = require('../package.json')
 
@@ -63,18 +65,8 @@ function generate(options) {
   })
 
 
-  // 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 model = resolveModel(options)
+    
   const spec = {
     // TODO: move to CreateSdkGen options
     spec: options.spec,
@@ -85,6 +77,8 @@ function generate(options) {
   if(options.watch) {
     spec.watch = [
       '../tm',
+      '../feature',
+      '../def',
       '../dist',
     ]
     createSdkGen.watch(spec)
@@ -96,6 +90,57 @@ function generate(options) {
 }
 
 
+function resolveModel(options) {
+
+  const typespec = `
+name: string
+year: number
+def: filepath: string
+feature: &: {
+  active: *false | boolean
+}
+`
+
+  const features = options.feature.map(name=>`feature:${name}:active:true`)
+  
+  const src = [
+    typespec,
+    `name: ${options.name}`,
+    `year: ${new Date().getFullYear()}`,
+    `def: filepath: "${options.def || 'def.yml'}"`,
+    '' === options.model ? '' : `@"${options.model}"`,
+    ...(options.set||[]),
+    ...(features||[]),
+  ].join('\n')
+  const aopts = {}
+  const root = Aontu(src, aopts)
+  const hasErr = root.err && 0 < root.err.length
+
+  // TODO: collect all errors
+  if (hasErr) {
+    // console.log('ERROR ROOT', root.err)
+    throw root.err[0].msg
+  }
+
+  let genctx = new Context({ root })
+  const model = root.gen(genctx)
+
+  // TODO: collect all errors
+  if (genctx.err && 0 < genctx.err.length) {
+    // console.log(genctx.err)
+    // console.log('ERROR GEN', genctx.err)
+    throw new Error(JSON.stringify(genctx.err[0]))
+  }
+  
+  model.def.filename = Path.basename(model.def.filepath)
+
+  // console.log('MODEL')
+  // console.dir(model,{depth:null})
+  
+  return model
+}
+
+
 function resolveOptions() {
 
   const args = parseArgs({
@@ -113,12 +158,24 @@ function resolveOptions() {
         default: '',
       },
       
+      set: {
+        type: 'string',
+        short: 's',
+        multiple: true,
+      },
+
       model: {
         type: 'string',
         short: 'm',
         default: '',
       },
       
+      feature: {
+        type: 'string',
+        short: 't',
+        multiple: true,
+      },
+      
       watch: {
         type: 'boolean',
         short: 'w',
@@ -147,6 +204,8 @@ function resolveOptions() {
     folder: '' === args.values.folder ? args.positionals[0] : args.values.folder,
     def: args.values.def,
     model: args.values.model,
+    feature: args.values.feature,
+    set: args.values.set,
     watch: !!args.values.watch,
     debug: !!args.values.debug,
     help: !!args.values.help,
@@ -163,6 +222,8 @@ function validateOptions(rawOptions) {
     folder: String,
     def: '',
     model: '',
+    feature: [String],
+    set: [String],
     watch: Boolean,
     debug: Boolean,
     help: Boolean,

package/dist/create-sdkgen.d.ts

@@ -6,9 +6,12 @@ type FullCreateSdkGenOptions = {
     rootpath: string;
 };
 type CreateSdkGenOptions = Partial<FullCreateSdkGenOptions>;
-declare function CreateSdkGen(opts: CreateSdkGenOptions): {
+type GenerateSpec = {
+    watch: string[];
+};
+declare function CreateSdkGen(opts: FullCreateSdkGenOptions): {
     generate: (spec: any) => Promise<void>;
-    watch: (spec: any) => Promise<void>;
+    watch: (spec: GenerateSpec) => Promise<void>;
 };
 export type { CreateSdkGenOptions, };
 export { CreateSdkGen, };

package/dist/create-sdkgen.js

@@ -28,18 +28,20 @@ exports.CreateSdkGen = CreateSdkGen;
 const Fs = __importStar(require("node:fs"));
 const chokidar_1 = require("chokidar");
 const JostracaModule = __importStar(require("jostraca"));
-const { Jostraca } = JostracaModule;
+const { each, names, 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) {
-        // console.log('CreateSdkGen.generate', spec)
+        const now = Date.now();
+        // console.log('CREATE SDK', now, new Date(now), spec)
         const { model } = spec;
         const ctx$ = { fs, folder, meta: { spec } };
         clear();
         const { Root } = require(rootpath);
+        completeModel(model);
         try {
             await jostraca.generate(ctx$, () => Root({ model }));
         }
@@ -76,6 +78,12 @@ function CreateSdkGen(opts) {
         watch,
     };
 }
+function completeModel(model) {
+    names(model, model.name);
+    each(model.feature, (feature) => {
+        names(feature, feature.key$);
+    });
+}
 // Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
 function clearRequire(path) {
     let filePath = require.resolve(path);

package/dist/create-sdkgen.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-sdkgen.js","sourceRoot":"","sources":["../src/create-sdkgen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-sdkgen.js","sourceRoot":"","sources":["../src/create-sdkgen.ts"],"names":[],"mappings":"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"}

package/dist/standard/ModelSdk.js

@@ -9,6 +9,9 @@ const ModelSdk = (0, jostraca_1.cmp)(function ModelSdk(props) {
     // const def = ctx$.fs.readFileSync(model.def.filepath)
     (0, jostraca_1.File)({ name: 'sdk.jsonic' }, () => {
         (0, jostraca_1.Content)(`
+
+@"../node_modules/@voxgig/sdkgen/model/sdkgen.jsonic"
+
 name: '${model.name}'
 
 @"api.jsonic"
@@ -28,26 +31,14 @@ main: sdk: build: go: @"go.jsonic"
 
 
 
-main: sdk: test: quick: entity: name: q
+main: sdk: test: quick: entity: name: foo
 
 
 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: {
+main: sdk: option: {
 
   endpoint: {
     kind: *String | string
@@ -65,6 +56,22 @@ main: sdk: options: {
   }
 }
 `);
+        (0, jostraca_1.each)(model.feature).filter((feature) => feature.active).map((feature) => {
+            (0, jostraca_1.Content)(`
+main: sdk: feature: ${feature.name}: {
+  active: true
+  config: {
+`);
+            (0, jostraca_1.Fragment)({
+                from: `${__dirname}/../../feature/standard/${feature.name}/${feature.name}-config.jsonic`,
+                indent: '    '
+            });
+            (0, jostraca_1.Content)(`
+  } 
+}
+
+`);
+        });
     });
 });
 exports.ModelSdk = ModelSdk;

package/dist/standard/ModelSdk.js.map

@@ -1 +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"}
+{"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;;;;SAIH,KAAK,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA8BL,KAAK,CAAC,IAAI;;;;;cAKV,KAAK,CAAC,IAAI;;;;;;;;CAQvB,CAAC,CAAA;QAGE,IAAA,eAAI,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE;YAEhF,IAAA,kBAAO,EACL;sBACc,OAAO,CAAC,IAAI;;;CAGjC,CAAC,CAAA;YAEI,IAAA,mBAAQ,EAAC;gBACP,IAAI,EACF,GAAG,SAAS,2BAA2B,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,gBAAgB;gBACrF,MAAM,EAAE,MAAM;aACf,CAAC,CAAA;YAEF,IAAA,kBAAO,EAAC;;;;CAIb,CAAC,CAAA;QACE,CAAC,CAAC,CAAA;IAEJ,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;AAIA,4BAAQ"}

package/dist/standard/Root.js

@@ -7,70 +7,36 @@ exports.Root = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const jostraca_1 = require("jostraca");
 const ModelSdk_1 = require("./ModelSdk");
+// TODO: rename to RootSdk
 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 })
+    // names(model, model.name)
     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' });
+        (0, jostraca_1.Copy)({
+            from: __dirname + '/../../tm/standard',
+            exclude: ['.env.local']
+        });
         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)({});
         });
+        (0, jostraca_1.Folder)({ name: 'feature' }, () => {
+            (0, jostraca_1.each)(model.feature).map((feature) => {
+                (0, jostraca_1.Folder)({ name: feature.name }, () => {
+                    (0, jostraca_1.Copy)({ from: __dirname + '/../../feature/standard/' + feature.name });
+                });
+            });
+        });
     });
-    /*
-    // 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

@@ -1 +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"}
+{"version":3,"file":"Root.js","sourceRoot":"","sources":["../../src/standard/Root.ts"],"names":[],"mappings":";;;;;;AAEA,0DAA4B;AAG5B,uCAWiB;AAGjB,yCAAqC;AAGrC,0BAA0B;AAC1B,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,2BAA2B;IAE3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IAElB,IAAA,kBAAO,EAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE;QAEvB,gCAAgC;QAChC,IAAA,eAAI,EAAC;YACH,IAAI,EAAE,SAAS,GAAG,oBAAoB;YACtC,OAAO,EAAE,CAAC,YAAY,CAAC;SACxB,CAAC,CAAA;QAEF,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,OAAO,EAAE,EAAE,GAAG,EAAE;YAC7B,IAAA,mBAAQ,EAAC,EAAE,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;QAEF,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE;YAC/B,IAAA,eAAI,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE;gBACvC,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;oBAClC,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,SAAS,GAAG,0BAA0B,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;gBACvE,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IAEJ,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;AAIA,oBAAI"}

package/dist/tsconfig.tsbuildinfo

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/create-sdkgen",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "main": "dist/create-sdkgen.js",
   "type": "commonjs",
   "types": "dist/create-sdkgen.d.ts",
@@ -40,15 +40,15 @@
   ],
   "devDependencies": {
     "@hapi/code": "^9.0.3",
-    "@types/node": "22.5.5",
-    "esbuild": "^0.23.1",
-    "memfs": "^4.12.0",
-    "typescript": "^5.6.2"
+    "@types/node": "22.7.6",
+    "esbuild": "^0.24.0",
+    "memfs": "^4.14.0",
+    "typescript": "^5.6.3"
   },
   "dependencies": {
     "aontu": "^0.22.0",
-    "chokidar": "^4.0.0",
+    "chokidar": "^4.0.1",
     "gubu": "^8.3.0",
-    "jostraca": "^0.6.0"
+    "jostraca": "^0.7.7"
   }
 }

package/src/create-sdkgen.ts

@@ -19,17 +19,23 @@ type FullCreateSdkGenOptions = {
 type CreateSdkGenOptions = Partial<FullCreateSdkGenOptions>
 
 
-const { Jostraca } = JostracaModule
+type GenerateSpec = {
+  watch: string[]
+}
+
 
+const { each, names, Jostraca } = JostracaModule
 
-function CreateSdkGen(opts: CreateSdkGenOptions) {
+
+function CreateSdkGen(opts: FullCreateSdkGenOptions) {
   const fs = opts.fs || Fs
   const folder = opts.folder || '.'
   const jostraca = Jostraca()
   const rootpath = opts.rootpath as string
 
   async function generate(spec: any) {
-    // console.log('CreateSdkGen.generate', spec)
+    const now = Date.now()
+    // console.log('CREATE SDK', now, new Date(now), spec)
 
     const { model } = spec
 
@@ -38,6 +44,8 @@ function CreateSdkGen(opts: CreateSdkGenOptions) {
     clear()
     const { Root } = require(rootpath)
 
+    completeModel(model)
+
     try {
       await jostraca.generate(ctx$, () => Root({ model }))
     }
@@ -48,7 +56,7 @@ function CreateSdkGen(opts: CreateSdkGenOptions) {
   }
 
 
-  async function watch(spec: any) {
+  async function watch(spec: GenerateSpec) {
     const fsw = new FSWatcher()
     let last_change_time = 0
 
@@ -89,6 +97,15 @@ function CreateSdkGen(opts: CreateSdkGenOptions) {
 }
 
 
+function completeModel(model: any) {
+  names(model, model.name)
+
+  each(model.feature, (feature: any) => {
+    names(feature, feature.key$)
+  })
+}
+
+
 // Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
 function clearRequire(path: string) {
   let filePath = require.resolve(path)

package/src/standard/ModelSdk.ts

@@ -6,7 +6,7 @@ import {
 
   Project,
   Folder,
-  Copy,
+  Fragment,
   File,
   Content,
 
@@ -26,6 +26,9 @@ const ModelSdk = cmp(function ModelSdk(props: any) {
 
   File({ name: 'sdk.jsonic' }, () => {
     Content(`
+
+@"../node_modules/@voxgig/sdkgen/model/sdkgen.jsonic"
+
 name: '${model.name}'
 
 @"api.jsonic"
@@ -45,26 +48,14 @@ main: sdk: build: go: @"go.jsonic"
 
 
 
-main: sdk: test: quick: entity: name: q
+main: sdk: test: quick: entity: name: foo
 
 
 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: {
+main: sdk: option: {
 
   endpoint: {
     kind: *String | string
@@ -82,6 +73,30 @@ main: sdk: options: {
   }
 }
 `)
+
+
+    each(model.feature).filter((feature: any) => feature.active).map((feature: any) => {
+
+      Content(
+        `
+main: sdk: feature: ${feature.name}: {
+  active: true
+  config: {
+`)
+
+      Fragment({
+        from:
+          `${__dirname}/../../feature/standard/${feature.name}/${feature.name}-config.jsonic`,
+        indent: '    '
+      })
+
+      Content(`
+  } 
+}
+
+`)
+    })
+
   })
 
 })

package/src/standard/Root.ts

@@ -20,53 +20,24 @@ import {
 import { ModelSdk } from './ModelSdk'
 
 
+// TODO: rename to RootSdk
 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 })
+  // names(model, model.name)
 
   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' })
+    Copy({
+      from: __dirname + '/../../tm/standard',
+      exclude: ['.env.local']
+    })
 
     const def = model.def.filepath
     if (null != def && '' !== def) {
@@ -75,30 +46,20 @@ const Root = cmp(function Root(props: any) {
       })
     }
 
-    Folder({ name: '.voxgig' }, () => { })
-
     Folder({ name: 'model' }, () => {
       ModelSdk({})
     })
+
+    Folder({ name: 'feature' }, () => {
+      each(model.feature).map((feature: any) => {
+        Folder({ name: feature.name }, () => {
+          Copy({ from: __dirname + '/../../feature/standard/' + feature.name })
+        })
+      })
+    })
+
   })
 
-  /*
-  // 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)
-    */
 })
 
 

package/tm/standard/build/doc.js

@@ -0,0 +1,23 @@
+
+const { DocGen } = require('@voxgig/docgen')
+
+try {
+  const config = {
+    root: __dirname+'/../dist/DocStaticRoot.js',
+    folder: __dirname+'/../doc',
+    def: __dirname+'/../def/$$def.filename$$',
+    meta: {
+      name: '$$name$$'
+    },
+    model: {
+      folder: __dirname+'/../model',
+    },
+  }
+
+  // console.log('DOC BUILD', config)
+  
+  module.exports = DocGen.makeBuild(config)
+}
+catch(e) {
+  console.log('DOC ERROR', e)
+}

package/tm/standard/build/sdk.js

@@ -1,10 +1,9 @@
 
 const { SdkGen } = require('@voxgig/sdkgen')
-const { Root } = require('../dist/Root')
-
 
 try {
   const config = {
+    root: __dirname+'/../dist/Root.js',
     folder: __dirname+'/../sdk',
     def: __dirname+'/../def/$$def.filename$$',
     meta: {
@@ -12,12 +11,10 @@ try {
     },
     model: {
       folder: __dirname+'/../model',
-      
-      entity: {}
     },
   }
 
-  module.exports = SdkGen.makeBuild(Root, config)
+  module.exports = SdkGen.makeBuild(config)
 
 }
 catch(e) {

package/tm/standard/def/DEFINITION.md

@@ -1,2 +1,4 @@
 # API Definition
- API definition (OpenAPI etc) files live here.
+ 
+API definition (OpenAPI etc) files live here.
+

package/tm/standard/model/.model-config/model-config.jsonic

@@ -4,10 +4,12 @@
 
 sys: model: builders: {
   sdk: load: 'build/sdk.js'
+  doc: load: 'build/doc.js'
 }
 
 sys: model: watch: {
-  'build': {}
   'dist': {}
   'tm': {}
+  'def': {}
+  'doc/static/src': {}
 }

package/tm/standard/model/go.jsonic

@@ -3,4 +3,4 @@ title: Go
 
 module: name: '$ModuleName'
 
-options: $.main.sdk.options
+option: $.main.sdk.option

package/tm/standard/model/js.jsonic

@@ -3,4 +3,4 @@ title: JavaScript
 
 module: name: '$ModuleName'
 
-options: $.main.sdk.options
+option: $.main.sdk.option

package/tm/standard/model/php.jsonic

@@ -3,4 +3,4 @@ title: PHP
 
 module: name: '$ModuleName'
 
-options: $.main.sdk.options
+option: $.main.sdk.option

package/tm/standard/model/py.jsonic

@@ -4,4 +4,4 @@ extension: py
 
 module: name: '$ModuleName'
 
-options: $.main.sdk.options
+option: $.main.sdk.option

package/tm/standard/model/rb.jsonic

@@ -3,4 +3,4 @@ title: Ruby
 
 module: name: '$ModuleName'
 
-options: $.main.sdk.options
+option: $.main.sdk.option

package/tm/standard/package.json

@@ -20,11 +20,12 @@
     }
   },
   "devDependencies": {
-    "@voxgig/model": "^3.2.0",
-    "@voxgig/sdkgen": "^0.6.0",
+    "@voxgig/model": "^3.5.0",
+    "@voxgig/sdkgen": "^0.12.0",
+    "@voxgig/docgen": "^0.2.2",
     "@voxgig/util": "^0.0.3",
-    "@types/node": "22.5.4",
-    "@stoplight/prism-cli": "^5.9.0",
-    "typescript": "^5.5.4"
+    "@types/node": "22.7.5",
+    "@stoplight/prism-cli": "^5.10.0",
+    "typescript": "^5.6.3"
   }
 }

package/tm/standard/src/DocStaticRoot.ts

@@ -0,0 +1,32 @@
+
+import {
+  names,
+  cmp,
+  each,
+
+  Project,
+  Folder,
+
+  Index,
+} from '@voxgig/docgen'
+
+
+const Root = cmp(function Root(props: any) {
+  const { model, ctx$ } = props
+
+  names(model, model.name)
+
+  ctx$.model = model
+
+  Project({}, () => {
+
+    Index({})
+
+  })
+})
+
+
+export {
+  Root
+}
+

package/tm/standard/src/Root.ts

@@ -9,26 +9,22 @@ import {
 
   Main,
   Entity,
+  Feature,
   Readme,
 
 } from '@voxgig/sdkgen'
 
-// import { Readme } from './Readme'
-// import { Main } from './Main'
-// import { Entity } from './Entity'
-
 
 const Root = cmp(function Root(props: any) {
   const { model, ctx$ } = props
 
   names(model, model.name)
 
-  // console.dir(model, { depth: null })
-
   ctx$.model = model
 
   const build = model.main.sdk.build
   const entity = model.main.sdk.entity
+  const feature = model.main.sdk.feature
 
   Project({}, () => {
 
@@ -40,11 +36,17 @@ const Root = cmp(function Root(props: any) {
 
         each(entity, (entity: any) => {
           names(entity, entity.name)
-          // console.log('ENTITY', entity.name)
 
           Entity({ build, entity })
         })
 
+        each(feature).filter((feature: any) => feature.active).map((feature: any) => {
+          names(feature, feature.name)
+
+          Feature({ build, feature })
+        })
+
+
         Main({ build })
 
         Readme({ build })

package/tm/standard/src/js/Entity_js.ts

@@ -1,7 +1,7 @@
 
 // Entity 1
 
-import { cmp, File, Content, Folder } from '@voxgig/sdkgen'
+import { cmp, each, File, Content, Folder } from '@voxgig/sdkgen'
 
 
 const Entity = cmp(function Entity(props: any) {
@@ -13,13 +13,34 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: entity.Name + '.' + build.name }, () => {
 
+      const modifyRequest = each(model.main.sdk.feature).map((feature: any) => {
+        if(feature.name == 'ratelimiter') {
+          return `
+    await this.sdk().features.${feature.name}.tryAcquire()`
+        
+        }
+        return `
+    spec = this.sdk().features.${feature.name}.modifyRequest(ctx)
+`
+      }).join('')
+
+      const modifyResult = each(model.main.sdk.feature).map((feature: any) => {
+        if(feature.name == 'ratelimiter') {
+          return ''
+        }
+        return `
+      ctx.result = this.sdk().features.${feature.name}.modifyResult(ctx)
+`
+      }).join('')
+
       Content(`
 // ${model.Name} ${build.Name} ${entity.Name} 1
 
 class ${entity.Name} {
   def
+  sdk
   data
-
+  query
 
   constructor(sdk,data) {
     this.sdk = ()=>sdk
@@ -31,92 +52,132 @@ class ${entity.Name} {
   }
 
 
-  async handleResult(op, res, spec, handler) {
+  async handleResult(ctx, res, spec, handler) {
     const status = res.status
 
     if(200 === status) {
-      const json = await res.json()
+      ctx.result = await res.json()
       // TODO: error
-      return handler(json)
+
+      ${modifyResult}
+      return handler(ctx.result)
     }
     else {
-      throw new Error('HTTP-ERROR: '+op+': ${entity.name}: '+status)
+      throw new Error('HTTP-ERROR: '+ctx.op+': ${entity.name}: '+status)
     }
   }
+`)
 
-
+      Content(`
   async save(data) {
-    const op = 'save'
+    const ctx = {op:'save',entity:this}
     this.data = data
+    this.query = {}
     // TODO: validate data
 
-    const spec = this.sdk().fetchSpec(op,this)
+    let spec = ctx.spec = this.sdk().fetchSpec(ctx,this)
+    ${modifyRequest}
     const res = await this.sdk().options.fetch(spec.url,spec)
 
-    return this.handleResult(op, res, spec, (json)=>{
+    return this.handleResult(ctx, res, spec, (json)=>{
       this.data = json
       return this
     })
   }
 
+`)
+
+      Content(`
   async create(data) {
-    const op = 'create'
+    const ctx = {op:'create',entity:this}
     this.data = data
+    this.query = {}
     // TODO: validate data
 
-    const spec = this.sdk().fetchSpec(op,this)
+    let spec = ctx.spec = this.sdk().fetchSpec(ctx,this)
+    ${modifyRequest}
+
+    if(this.sdk().options.debug) {
+      console.log('FETCH-create', spec)
+    }
+
     const res = await this.sdk().options.fetch(spec.url,spec) 
 
-    return this.handleResult(op, res, spec, (json)=>{
+    return this.handleResult(ctx, res, spec, (json)=>{
       this.data = json
       return this
     })
   }
 
 
-  async load(data) {
-    const op = 'load'
-    this.data = data
-    // TODO: check data.id defined
-    // TODO: separate data and query
+`)
+
+      Content(`
+  async load(query) {
+    const ctx = {op:'load',entity:this}
+    this.data = {}
+    this.query = query || {}
+
+    let spec = ctx.spec = this.sdk().fetchSpec(ctx,this)
+    ${modifyRequest}
+
+    if(this.sdk().options.debug) {
+      console.log('FETCH-load', spec)
+    }
 
-    const spec = this.sdk().fetchSpec(op,this)
     const res = await this.sdk().options.fetch(spec.url,spec)
 
-   return this.handleResult(op, res, spec, (json)=>{
+    return this.handleResult(ctx, res, spec, (json)=>{
       this.data = json
       return this
     })
   }
 
 
-  async remove(data) {
-    const op = 'remove'
-    this.data = data
-    // TODO: check data.id defined
+`)
+
+      Content(`
+  async remove(query) {
+    const ctx = {op:'remove',entity:this}
+    this.data = {}
+    this.query = query || {}
 
-    const spec = this.sdk().fetchSpec(op,this)
+    let spec = ctx.spec = this.sdk().fetchSpec(ctx,this)
+    ${modifyRequest}
     const res = await this.sdk().options.fetch(spec.url,spec)
 
-    return this.handleResult(op, res, spec, (json)=>{
+    return this.handleResult(ctx, res, spec, (json)=>{
       this.data = json
       return null
     })
   }
 
+`)
 
+      Content(`
   async list(query) {
-    const op = 'list'
-    // TODO: use query if defined
+    const ctx = {op:'list',entity:this}
+    this.data = {}
+    this.query = query || {}
+
+    let spec = ctx.spec = this.sdk().fetchSpec(ctx,this)
+    ${modifyRequest}
+
+    if(this.sdk().options.debug) {
+      console.log('FETCH-load', spec)
+    }
 
-    const spec = this.sdk().fetchSpec(op,this)
     const res = await this.sdk().options.fetch(spec.url,spec)
 
-    return this.handleResult(op, res, spec, (json)=>{
+    return this.handleResult(ctx, res, spec, (json)=>{
       return json.list.map(data=>this.sdk().${entity.Name}(data))
     })
   }
 
+`)
+
+      Content(`
+
 }
 
 

package/tm/standard/src/js/Main_js.ts

@@ -1,6 +1,6 @@
 
 
-import { cmp, each, camelify, File, Content, Copy, Folder } from '@voxgig/sdkgen'
+import { cmp, each, names, File, Content, Copy, Folder } from '@voxgig/sdkgen'
 
 
 import { MainEntity } from './MainEntity_js'
@@ -11,7 +11,7 @@ const Main = cmp(async function Main(props: any) {
   const { build } = props
   const { model } = props.ctx$
 
-  const entity = model.main.sdk.entity
+  const { entity, feature } = model.main.sdk
 
   Copy({ from: 'tm/' + build.name + '/package.json', name: 'package.json' })
 
@@ -25,8 +25,16 @@ const Main = cmp(async function Main(props: any) {
 // ${model.Name} ${build.Name} SDK
 `)
 
+      each(feature, (feature: any) => {
+        names(feature, feature.name)
+        Content(`
+const { ${feature.Name + 'Feature'} } = require('./${feature.name}/${feature.Name}Feature')
+`)
+      })
+
+
       each(entity, (entity: any) => {
-        entity.Name = camelify(entity.name)
+        names(entity, entity.name)
         Content(`
 const { ${entity.Name} } = require('./${entity.Name}')
 `)
@@ -38,11 +46,16 @@ const { ${entity.Name} } = require('./${entity.Name}')
           a + ('String' === opt.kind ?
             `    required('string','${opt.name}',options)\n` : ''), '')
 
+      const features = each(feature).map((feature: any) => `
+${feature.name}: new ${feature.Name}Feature(this, ${JSON.stringify(feature.config || {})})
+`).join(',\n')
+
 
       Content(`
     
 class ${model.Name}SDK {
   options
+  features
 
   static make(options) {
     return new ${model.Name}SDK(options)
@@ -54,7 +67,11 @@ class ${model.Name}SDK {
 
 ${validate_options}
 
-    this.options.fetch = this.options.fetch || fetch 
+    this.options.fetch = this.options.fetch || fetch
+
+    this.features = {
+${features}
+    }
   }
 
 
@@ -81,16 +98,25 @@ ${validate_options}
     return JSON.stringify(msg)
   }
 
-  fetchSpec(op,ent) {
-    const method = this.method(op, ent)
+  fetchSpec(ctx) {
+    const { op } = ctx
+    const method = this.method(op, ctx.entity)
+
+    let qpairs = Object.entries(ctx.entity.query)
+      .filter(entry=>!entry[0].includes('$'))
+      .reduce((qp,entry)=>
+         (qp.push(encodeURIComponent(entry[0])+'='+encodeURIComponent(entry[1])),qp),[])
+
+    let query = 0===qpairs.length?'':'?'+(qpairs.join('&'))
+
     const spec = {
-      url: this.endpoint(op, ent),
+      url: this.endpoint(op, ctx.entity)+query,
       method,
       headers: {
         'content-type': 'application/json',
         'authorization': 'Bearer '+this.options.apikey
       },
-      body: 'GET' === method || 'DELETE' === method ? undefined : this.body(op, ent),
+      body: 'GET' === method || 'DELETE' === method ? undefined : this.body(op, ctx.entity),
     }
     return spec
   }

package/tm/standard/src/js/Quick_js.ts

@@ -1,5 +1,5 @@
 
-import { names, getx, cmp, File, Content } from '@voxgig/sdkgen'
+import { names, getx, each, cmp, File, Content } from '@voxgig/sdkgen'
 
 
 const Quick = cmp(function Quick(props: any) {
@@ -8,14 +8,22 @@ const Quick = cmp(function Quick(props: any) {
 
   // get quick entity from build config
 
-  // console.log('CONFIG 2')
-  // console.dir(spec.config, { depth: null })
 
+  let entmap = getx(spec.config.guideModel, 'guide entity?test:quick:active=true')
+  let ent: any = Object.values(entmap)[0]
+  ent.name = Object.keys(entmap)[0]
 
-  const ent = getx(spec.config, 'entity *').find((ent: any) => ent.test.quick.active)
-  names(ent, ent.key$)
+  ent = ent || {}
+  names(ent, ent.name)// , ent.key$ || 'name')
+
+  // TODO: selected features should be active by default!
+
+  const featureOptions = each(model.main.sdk.feature)
+    .filter((f: any) => f.active)
+    .reduce((a: any, f: any) => a + `\n    ${f.name}: { active: true },`, '')
+
+  // console.log('QUICK', ent, featureOptions)
 
-  console.log('ENT 3', ent)
 
   File({ name: 'quick.' + build.name }, () => {
 
@@ -31,29 +39,30 @@ async function run() {
   const client = ${model.Name}SDK.make({
     endpoint: process.env.${model.NAME}_ENDPOINT,
     apikey: process.env.${model.NAME}_APIKEY,
+    ${featureOptions}
   })
 
   let out
 
 `)
 
-    if (ent.test.quick.create) {
+    if (ent.test?.quick.create) {
       Content(`    
-  out = await client.${ent.Name}().create(${JSON.stringify(ent.test.quick.create)})
+  out = await client.${ent.Name}().create(${JSON.stringify(ent.test?.quick.create)})
   console.log('${ent.Name}.load', out) 
 `)
     }
 
-    if (ent.test.quick.load) {
+    if (ent.test?.quick.load) {
       Content(`    
-  out = await client.${ent.Name}().load(${JSON.stringify(ent.test.quick.load)})
+  out = await client.${ent.Name}().load(${JSON.stringify(ent.test?.quick.load)})
   console.log('${ent.Name}.load', out) 
 `)
     }
 
-    if (ent.test.quick.list) {
+    if (ent.test?.quick.list) {
       Content(`    
-  out = await client.${ent.Name}().list(${JSON.stringify(ent.test.quick.list)})
+  out = await client.${ent.Name}().list(${JSON.stringify(ent.test?.quick.list)})
   console.log('${ent.Name}.list', out)
 `)
     }

package/src/standard/ModelSdk.ts~

@@ -1 +0,0 @@
-

package/src/standard/Root.ts~

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

package/tm/standard/model/sdk.jsonic.off

@@ -1,60 +0,0 @@
-
-name: '$$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: $$test.quick.entity.name$$
-
-
-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: "$$Name$$ API URL"
-  }
-
-  apikey: {
-    kind: *String | string
-    short: "$$Name$$ API Key"
-  }
-  
-  fetch: {
-    kind: *Any | string
-    publish: false
-  }
-}
-
-
-
-