@voxgig/sdkgen 0.24.0 → 0.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "types": "dist/sdkgen.d.ts",
@@ -41,9 +41,9 @@
   "devDependencies": {
     "@hapi/code": "^9.0.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "24.1.0",
+    "@types/node": "24.2.0",
     "json-schema-to-ts": "^3.1.1",
-    "memfs": "^4.25.1",
+    "memfs": "^4.36.0",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {

package/project/.sdk/src/cmp/ts/EntityTest_ts.ts

@@ -57,7 +57,7 @@ function basicSetup(extra?: any) {
   if ('TRUE' === setup.dm.p.${model.NAME}_TEST_LIVE) {
     client = new ${model.Name}SDK(merge([
       {
-        apikey: process.env.${model.Name}_APIKEY,
+        apikey: process.env.${model.NAME}_APIKEY,
       },
       extra])
     )

package/project/.sdk/src/cmp/ts/Package_ts.ts

@@ -29,10 +29,11 @@ const Package = cmp(async function Package(props: any) {
 
   const sdkname = model.name
   const origin = null == model.origin ? '' : `@${model.origin}/`
+  const sdknamesuffix = model.origin?.endsWith('-sdk') ? '' : '-sdk'
 
   // TODO: complete SDK meta data in model and use here
   const pkg = {
-    name: `${origin}${sdkname}-sdk`,
+    name: `${origin}${sdkname}${sdknamesuffix}`,
     version: `0.0.1`,
     description: 'DESCRIPTION',
     main: `dist/${model.const.Name}SDK.js`,

package/project/.sdk/tm/ts/src/utility/SpecUtility.ts

@@ -36,12 +36,12 @@ function spec(ctx: Context) {
     let hasQuery = false
     const paramQuery: any = {}
     for (let paramName of op.params) {
-      paramQuery[paramName] = null == ctx.spec.params[paramName] ? undefined : true
+      paramQuery[paramName] = null == ctx.spec.params[paramName] ? false : true
       hasQuery = true
     }
+
     if (hasQuery) {
       const foundParamAlts = select(op.pathalt, paramQuery)
-      console.log('PQ', paramQuery, foundParamAlts)
       if (0 < size(foundParamAlts)) {
         ctx.spec.path = foundParamAlts[0].path
       }

package/project/.sdk/tm/ts/src/utility/StructUtility.ts

@@ -756,11 +756,12 @@ function merge(val: any): any {
           parent: any,
           path: string[]
         ) {
+          // No key at top.
           if (null == key) {
             return val
           }
 
-          // Get the curent value at the current path in obj.
+          // Get the current value at the current path in obj.
           // NOTE: this is not exactly efficient, and should be optimised.
           let lenpath = path.length
           cI = lenpath - 1
@@ -768,20 +769,37 @@ function merge(val: any): any {
             cur[cI] = getpath(out, slice(path, 0, lenpath - 1))
           }
 
+          // console.log('AAA', path, cur[cI])
+
           // Create node if needed.
           if (!isnode(cur[cI])) {
             cur[cI] = islist(parent) ? [] : {}
           }
 
+          // console.log('BBB', path, cur[cI])
+
+          // console.log('VAL', path, val, isnode(val), isempty(val))
+
           // Node child is just ahead of us on the stack, since
           // `walk` traverses leaves before nodes.
-          if (isnode(val) && !isempty(val)) {
-            setprop(cur[cI], key, cur[cI + 1])
-            cur[cI + 1] = UNDEF
+          if (isnode(val)) {
+            const missing = UNDEF === getprop(cur[cI], key)
+            if (!isempty(val) || missing) { //  || ) {
+              // console.log('CCC')
+
+              // if (missing) {
+              //   console.log('MISSING', key, val, cur[cI], cur[cI + 1])
+              // }
+
+              const mval = missing ? val : cur[cI + 1]
+              setprop(cur[cI], key, mval)
+              cur[cI + 1] = UNDEF
+            }
           }
 
           // Scalar child.
           else {
+            // console.log('DDD', cur[cI], key, val)
             setprop(cur[cI], key, val)
           }
 
@@ -2304,6 +2322,8 @@ const _injecthandler: Injector = (
   const iscmd = isfunc(val) && (UNDEF === ref || ref.startsWith(S_DS))
 
   // Only call val function if it is a special command ($NAME format).
+  // TODO: OR if meta.'$CALL'
+
   if (iscmd) {
     out = (val as Injector)(inj, val, ref, store)
   }