@voxgig/create-sdkgen 0.4.0 → 0.5.0

package/bin/create-sdkgen

@@ -4,7 +4,7 @@ const Path = require('node:path')
 const { statSync } = require('node:fs')
 const { parseArgs } = require('node:util')
 
-const { Gubu, Fault, One } = require('gubu')
+const { Shape, Fault, One } = require('shape')
 
 const Pkg = require('../package.json')
 
@@ -21,10 +21,6 @@ async function run() {
   try {
     let options = resolveOptions()
 
-    if(options.debug) {
-      DEBUG = true
-    }
-
     if(options.version) {
       version()
     }
@@ -105,7 +101,7 @@ function resolveOptions() {
 
         folder: {
           type: 'string',
-          short: 'f',
+          short: 'o',
           default: ''
         },
 
@@ -161,12 +157,12 @@ function resolveOptions() {
   name = null == name ? '' : name
   name = '' === name && (args.values.help || args.values.version) ? '__none__' : name
 
-  targets = args.values.target || []
+  let targets = args.values.target || []
   if( 1 < args.positionals.length ) {
     targets.push(args.positionals.slice(1))
   }
 
-  features = args.values.feature || []
+  let features = args.values.feature || []
   
   const options = {
     name,
@@ -193,7 +189,7 @@ function resolveOptions() {
 
 
 function validateOptions(rawOptions) {
-  const optShape = Gubu({
+  const optShape = Shape({
     name: Fault('The first argument must be the project name.', String),
     def: '',
     project: String,
@@ -245,13 +241,16 @@ Usage: npm create @voxgig/sdkgen@latest <name> <args>
   <args> are the command arguments:
 
     --def        Path to the OpenAPI definition file (optional).
-    -d            
+    -d
 
     --project    Project template (folder or package reference). Default: standard.
-    -p            
+    -p
 
     --folder     Target output folder. Default: ./<name>-sdk.
-    -f            
+    -o
+
+    --feature    Features to add. Can be specified multiple times.
+    -f
 
     --install    Run installation scripts. Default: install.
     --no-install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/create-sdkgen",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": "dist/create-sdkgen.js",
   "type": "commonjs",
   "types": "dist/create-sdkgen.d.ts",
@@ -41,17 +41,15 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@hapi/code": "^9.0.3",
-    "@types/node": "25.3.3",
-    "esbuild": "^0.27.3",
-    "memfs": "^4.56.10",
+    "@types/node": "25.5.0",
+    "memfs": "^4.57.1",
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@voxgig/util": "^0.2.2",
-    "aontu": "^0.36.0",
+    "@voxgig/util": "^0.4.0",
+    "aontu": "^0.39.0",
     "chokidar": "^5.0.0",
-    "gubu": "^9.0.0",
-    "jostraca": "^0.25.1"
+    "jostraca": "^0.28.0",
+    "shape": "^10.0.1"
   }
 }

package/project/standard/.sdk/test/.model-config/model-config.json

@@ -1,7 +1,11 @@
 {
   "sys": {
     "model": {
-      "builders": {}
+      "builders": {},
+      "action": {},
+      "order": {
+        "action": ""
+      }
     }
   }
 }

package/project/standard/.sdk/test/primary/{inward.jsonic → clean.jsonic}

@@ -1,3 +1,2 @@
 
 basic: set: []
-

package/project/standard/.sdk/test/primary/done.jsonic

@@ -4,4 +4,3 @@ basic: set: [
 
   { ctx:{result:{ok:false}}, err:'unknown operation: unknown error' }
 ]
-

package/project/standard/.sdk/test/primary/{outward.jsonic → featureAdd.jsonic}

@@ -1,3 +1,2 @@
 
 basic: set: []
-

package/project/standard/.sdk/test/primary/featureHook.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/featureInit.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/fetcher.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/makeContext.jsonic

@@ -0,0 +1,4 @@
+
+basic: set: [
+  { in:{opname:create}, match:out:{op:{name:create,input:data}} }
+]

package/project/standard/.sdk/test/primary/makeError.jsonic

@@ -0,0 +1,16 @@
+
+basic: set: [
+  { args:[{}], err:'SolardemoSDK: unknown operation: unknown error' }
+  { args:[{},{}], err:'SolardemoSDK: unknown operation: unknown error' }
+
+  { args:[{opname:foo}], err:'SolardemoSDK: foo: unknown error' }
+  { args:[{opname:foo,result:{}}], err:'SolardemoSDK: foo: unknown error' }
+
+  { args:[{opname:foo,result:{err:{message:bar}}}], err:'SolardemoSDK: foo: bar' }
+  { args:[{opname:foo}, {message:zed}], err:'SolardemoSDK: foo: zed' }
+
+  { args:[{opname:o0}, {message:e0}], err:'SolardemoSDK: o0: e0'
+    match: err:message:'SolardemoSDK: o0: e0'
+  }
+
+]

package/project/standard/.sdk/test/primary/makeFetchDef.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/{options.jsonic → makeOptions.jsonic}

@@ -1,7 +1,7 @@
 
 basic: set: [
   {
-    in:prep: { config:{}, options:{} }
+    in: { config:{}, options:{} }
     match: out: {
       base: 'http://localhost:8000',
       entity: {},
@@ -11,14 +11,14 @@ basic: set: [
   }
 
   {
-    in:prep: { options: {}, config: options: {
+    in: { options: {}, config: { options: {
       base: 'http://cbase.example',
       prefix: 'cpre-',
       suffix: 'csuf-',
       entity: {
         foo: {}
       }
-    }}
+    }}}
     match: out: {
       base: 'http://cbase.example',
       prefix: 'cpre-',
@@ -32,7 +32,7 @@ basic: set: [
   }
 
   {
-    in:prep: {
+    in: {
       options: {
         base: 'http://cbase.example',
         prefix: 'cpre-',
@@ -55,6 +55,5 @@ basic: set: [
     }
   }
 
-  
-]
 
+]

package/project/standard/.sdk/test/primary/{request.jsonic → makeRequest.jsonic}

@@ -1,15 +1,8 @@
 
 
-DEF: {
-  client: a: test: options: { base: 'b0', system: fetch: '`fetch`' }
-}
-
-
-
 basic: set: [
   {
     ctx: {
-      op: params: [],
       spec: {
         base: 'http://localhost/base-',
         prefix: 'prefix-',
@@ -17,15 +10,16 @@ basic: set: [
         path: '/p0',
         params: {},
         query: {},
+        headers: {},
+        method: 'GET',
+        body: '__UNDEF__',
         alias: {},
-      }      
+      }
     },
-    client: a
 
-    match:out: {
-      native: '__EXISTS__'
-      err: '__UNDEF__'
+    match:ctx: {
+      response: '__EXISTS__'
+      result: '__EXISTS__'
     }
   }
 ]
-

package/project/standard/.sdk/test/primary/makeResponse.jsonic

@@ -0,0 +1,22 @@
+
+basic: set: [
+  {
+    ctx: {
+      response: {
+        status: 201,
+        statusText: 'OK1'
+        headers: {h1:v1}
+        body: {b:1}
+      }
+      spec: {step:''}
+      result: {ok:false,status:-1,statusText:''}
+      target: {transform:{}}
+    }
+    match:ctx:result: {
+      ok: true
+      status: 201
+      statusText: 'OK1'
+      body: {b:1}
+    }
+  }
+]

package/project/standard/.sdk/test/primary/makeResult.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/{spec.jsonic → makeSpec.jsonic}

@@ -1,6 +1,6 @@
 
 DEF: {
-  client: a: test: options: {
+  setup: a: {
     base: 'BASE-',
     prefix: 'PREFIX-',
     suffix: 'SUFFIX-',
@@ -11,9 +11,15 @@ DEF: {
 basic: set: [
   {
     ctx: {
-      op:name: 'list'
+      opname: 'list'
+      target: {
+        parts: [],
+        args: { params: [] },
+        params: [],
+        alias: {},
+        transform: {},
+      }
     },
-    client: a
     match: ctx: spec: {
       base: 'BASE-',
       prefix: 'PREFIX-',
@@ -25,8 +31,6 @@ basic: set: [
         'content-type': 'application/json',
       },
       step: 'start',
-      alias: {}
     }
   }
 ]
-

package/project/standard/.sdk/test/primary/makeTarget.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/makeUrl.jsonic

@@ -0,0 +1,21 @@
+
+basic: set: [
+  {
+    ctx: {
+      spec: {
+        base: 'base-',
+        prefix: 'prefix-',
+        suffix: 'suffix-',
+        path: '/p0/{a}',
+        params: {
+          a: 'A'
+        },
+        query: {},
+        alias: {}
+      },
+      result: { resmatch: {} }
+    },
+    out: 'base-/prefix-/p0/A/suffix-'
+  }
+
+]

package/project/standard/.sdk/test/primary/operator.jsonic

@@ -1,60 +1,17 @@
 
 basic: set: [
   {
-    ctx: {
-      op: {
-        entity: 'Foo',
-        name: 'load',
-        path: '/foo/{foo_id}',
-        params: ['foo_id'],
-        alias: {'foo_id':'id','id':'foo_id'},
-        match: {},
-        data: {},
-        state: {},
-        reqform: '`data`',
-        resform: '`body`',
-        check: {}
-      }
+    in: {
+      entity: 'Foo',
+      name: 'load',
+      input: 'match',
+      targets: []
     }
-    match: {
-      ctx: op: {
-        kind: ''
-        entity: 'Foo',
-        name: 'load',
-        path: '/foo/{foo_id}',
-        params: ['foo_id'],
-        alias: {'foo_id':'id','id':'foo_id'},
-        match: {},
-        data: {},
-        state: {},
-        reqform: '`data`',
-        resform: '`body`',
-        check: {}
-      }
-    } 
-  }
-
-  {
-    ctx: op: {}
-    err: 'Invalid data: Expected field entity to be string, but found no value. | Expected field kind to be exactly equal to one of req, res, but found no value. | Expected field name to be string, but found no value. | Expected field path to be string, but found no value. | Expected field reqform to be one of string, object, function, but found no value. | Expected field resform to be one of string, object, function, but found no value.'
-  }
-
-  {
-    ctx: op: {
-      entity: 11,
-      name: 22,
-      path: 33,
-      params: [44],
-      alias: {'foo_id':55},
-      match: 101,
-      data: 102,
-      state: 103,
-      reqform: 66,
-      resform: 77,
-      check: 88
+    match: out: {
+      entity: 'Foo',
+      name: 'load',
+      input: 'match',
+      targets: []
     }
-    err: 'Invalid data: Expected field alias.foo_id to be string, but found number: 55. | Expected field check to be object, but found number: 88. | Expected field data to be one of {}, [], but found number: 102. | Expected field data to be array, but found number: 102. | Expected field entity to be string, but found number: 11. | Expected field kind to be exactly equal to one of req, res, but found no value. | Expected field match to be object, but found number: 101. | Expected field name to be string, but found number: 22. | Expected field path to be string, but found number: 33. | Expected field reqform to be one of string, object, function, but found number: 66. | Expected field resform to be one of string, object, function, but found number: 77. | Expected field state to be object, but found number: 103.'
   }
-
 ]
-

package/project/standard/.sdk/test/primary/{findparam.jsonic → param.jsonic}

@@ -1,12 +1,12 @@
 
 
 DEF: {
-  ctx0: {op:{}}
-  ctx1: .ctx0 & {op:kind:res}
-  ctx2: .ctx1 & {op:match:{}}
-  ctx3: .ctx2 & {op:match:a:'A'}
-  ctx4: .ctx3 & {op:alias:{}}
-  ctx5: .ctx4 & {op:alias:b:'a',spec:{}}
+  ctx0: {target:{alias:{}}}
+  ctx1: .ctx0
+  ctx2: .ctx1 & {reqmatch:{}}
+  ctx3: .ctx2 & {reqmatch:{a:'A'}}
+  ctx4: .ctx3
+  ctx5: .ctx4 & {target:{alias:{b:a}},spec:{alias:{}}}
 }
 
 basic: set: [
@@ -19,4 +19,3 @@ basic: set: [
   { mark:70, args: [ .....DEF.ctx5, a ], out: 'A' }
   { mark:80, args: [ .....DEF.ctx5, b ], out: 'A', match: ctx:spec:alias:a:'b' }
 ]
-

package/project/standard/.sdk/test/primary/prepareAuth.jsonic

@@ -0,0 +1,13 @@
+
+DEF: {
+  setup: a: { apikey: 'APIKEY01' }
+}
+
+
+basic: set: [
+
+  { ctx: spec:headers:{}
+    match: ctx:spec:headers:authorization:' APIKEY01'
+  }
+
+]

package/project/standard/.sdk/test/primary/prepareBody.jsonic

@@ -0,0 +1,18 @@
+
+basic: set: [
+  {
+    ctx: {
+      opname:create, target:{transform:{req:'`reqdata.foo`'}},
+      reqdata:{foo:{x:1}}
+    }
+    out: {x:1}
+  }
+
+  {
+    ctx: {
+      opname:create, target:{transform:{req:'`reqdata.bar`'}},
+      reqdata:{foo:{x:2}}
+    }
+  }
+
+]

package/project/standard/.sdk/test/primary/prepareHeaders.jsonic

@@ -0,0 +1,4 @@
+
+basic: set: [
+  { ctx: {}, out: { 'content-type': 'application/json' } }
+]

package/project/standard/.sdk/test/primary/prepareMethod.jsonic

@@ -0,0 +1,10 @@
+
+basic: set: [
+  { ctx: { opname:create }, out: POST }
+  { ctx: { opname:update }, out: PUT }
+  { ctx: { opname:list }, out: GET }
+  { ctx: { opname:load }, out: GET }
+  { ctx: { opname:remove }, out: DELETE }
+
+  { ctx: { opname:bad } }
+]

package/project/standard/.sdk/test/primary/prepareParams.jsonic

@@ -0,0 +1,9 @@
+
+basic: set: [
+  { ctx: {target:{args:{params:[]},params:[],alias:{}}}, out:{} }
+  { ctx: {target:{args:{params:[{name:a}]},params:[a],alias:{}},reqmatch:{}}, out:{} }
+  { ctx: {target:{args:{params:[{name:a}]},params:[a],alias:{}},reqmatch:{a:A}}, out:{a:A} }
+  { ctx: {target:{args:{params:[{name:a}]},params:[a],alias:{}},reqmatch:{b:B}}, out:{} }
+  { ctx: {target:{args:{params:[{name:a}]},params:[a],alias:{}},reqmatch:{a:A,b:B}}, out:{a:A} }
+
+]

package/project/standard/.sdk/test/primary/preparePath.jsonic

@@ -0,0 +1,2 @@
+
+basic: set: []

package/project/standard/.sdk/test/primary/prepareQuery.jsonic

@@ -0,0 +1,8 @@
+
+basic: set: [
+  { mark:10, ctx: {target:{params:[],alias:{}},reqmatch:{}}, out: {} }
+  { mark:20, ctx: {target:{params:[a],alias:{}},reqmatch:{}}, out: {} }
+  { mark:30, ctx: {target:{params:[a],alias:{}},reqmatch:{a:A}}, out: {} }
+  { mark:40, ctx: {target:{params:[a],alias:{}},reqmatch:{b:B}}, out: {b:B} }
+  { mark:50, ctx: {target:{params:[a],alias:{}},reqmatch:{a:A,b:B}}, out: {b:B} }
+]

package/project/standard/.sdk/test/primary/primary-test-index.jsonic

@@ -1,23 +1,30 @@
-primary: auth: @"auth.jsonic"
-primary: body: @"body.jsonic"
-primary: context: @"context.jsonic"
+primary: clean: @"clean.jsonic"
 primary: done: @"done.jsonic"
-primary: error: @"error.jsonic"
-primary: findparam: @"findparam.jsonic"
-primary: fullurl: @"fullurl.jsonic"
-primary: headers: @"headers.jsonic"
-primary: inward: @"inward.jsonic"
-primary: method: @"method.jsonic"
+primary: featureAdd: @"featureAdd.jsonic"
+primary: featureHook: @"featureHook.jsonic"
+primary: featureInit: @"featureInit.jsonic"
+primary: fetcher: @"fetcher.jsonic"
+primary: makeContext: @"makeContext.jsonic"
+primary: makeError: @"makeError.jsonic"
+primary: makeFetchDef: @"makeFetchDef.jsonic"
+primary: makeOptions: @"makeOptions.jsonic"
+primary: makeRequest: @"makeRequest.jsonic"
+primary: makeResponse: @"makeResponse.jsonic"
+primary: makeResult: @"makeResult.jsonic"
+primary: makeSpec: @"makeSpec.jsonic"
+primary: makeTarget: @"makeTarget.jsonic"
+primary: makeUrl: @"makeUrl.jsonic"
 primary: operator: @"operator.jsonic"
-primary: options: @"options.jsonic"
-primary: outward: @"outward.jsonic"
-primary: params: @"params.jsonic"
-primary: query: @"query.jsonic"
-primary: reqform: @"reqform.jsonic"
-primary: request: @"request.jsonic"
-primary: resbasic: @"resbasic.jsonic"
-primary: resbody: @"resbody.jsonic"
-primary: resform: @"resform.jsonic"
-primary: resheaders: @"resheaders.jsonic"
-primary: response: @"response.jsonic"
-primary: spec: @"spec.jsonic"
+primary: param: @"param.jsonic"
+primary: prepareAuth: @"prepareAuth.jsonic"
+primary: prepareBody: @"prepareBody.jsonic"
+primary: prepareHeaders: @"prepareHeaders.jsonic"
+primary: prepareMethod: @"prepareMethod.jsonic"
+primary: prepareParams: @"prepareParams.jsonic"
+primary: preparePath: @"preparePath.jsonic"
+primary: prepareQuery: @"prepareQuery.jsonic"
+primary: resultBasic: @"resultBasic.jsonic"
+primary: resultBody: @"resultBody.jsonic"
+primary: resultHeaders: @"resultHeaders.jsonic"
+primary: transformRequest: @"transformRequest.jsonic"
+primary: transformResponse: @"transformResponse.jsonic"

package/project/standard/.sdk/test/primary/resultBasic.jsonic

@@ -0,0 +1,14 @@
+
+basic: set: [
+  { ctx:{response:{status:200,statusText:'OK'},result:{}},
+    match:out:{status:200,statusText:'OK'}
+  }
+
+  { ctx:{response:{status:500,statusText:'r01'},result:{}},
+    match:out:{status:500,statusText:'r01',err:message:'request: 500: r01'}
+  }
+
+  { ctx:{response:{status:400,statusText:'BAD'},result:{err:{message:'Foo'}}},
+    match:out:{status:400,statusText:'BAD',err:message:'Foo: request: 400: BAD'}
+  }
+]

package/project/standard/.sdk/test/primary/resultBody.jsonic

@@ -0,0 +1,4 @@
+
+basic: set: [
+  { ctx:{response:{body:{a:A,b:B}},result:{}}, match:ctx:result:body:{a:A,b:B} }
+]

package/project/standard/.sdk/test/primary/resultHeaders.jsonic

@@ -0,0 +1,7 @@
+
+basic: set: [
+  {
+    ctx:{response:{headers:{a:A,B:B}},result:{}},
+    match:ctx:result:headers:{a:A,b:B}
+  }
+]

package/project/standard/.sdk/test/primary/transformRequest.jsonic

@@ -0,0 +1,8 @@
+
+basic: set: [
+  {
+    ctx: { spec:{step:''}, target:{transform:{req:'`reqdata.foo`'}}, reqdata:{foo:{x:1}} }
+    out: {x:1}
+    match: ctx:spec:step:reqform
+  }
+]

package/project/standard/.sdk/test/primary/transformResponse.jsonic

@@ -0,0 +1,10 @@
+
+basic: set: [
+
+  {
+    ctx: { result:{ok:true,body:{foo:{x:1}}}, spec:{step:''}, target:{transform:{res:'`body.foo`'}} }
+    out: {x:1}
+    match: ctx:spec:step:'resform'
+  }
+
+]