@voxgig/sdkgen 0.36.0 → 0.37.0

package/project/.sdk/src/cmp/js/fragment/EntityLoadOp.fragment.js

@@ -1,16 +1,12 @@
 
 class EntityOperation {
 
-  #match
-  #data
-  #utility
-
 
   // EJECT-START
 
   async load(reqmatch, ctrl) {
 
-    const utility = this.#utility
+    const utility = this._utility
 
     const {
       makeContext,
@@ -29,8 +25,8 @@ class EntityOperation {
     let ctx = makeContext({
       opname: 'load',
       ctrl,
-      match: this.#match,
-      data: this.#data,
+      match: this._match,
+      data: this._data,
       reqmatch
     }, this._entctx)
 
@@ -79,11 +75,11 @@ class EntityOperation {
 
       if (null != ctx.result) {
         if (null != ctx.result.resmatch) {
-          this.#match = ctx.result.resmatch
+          this._match = ctx.result.resmatch
         }
 
         if (null != ctx.result.resdata) {
-          this.#data = ctx.result.resdata
+          this._data = ctx.result.resdata
         }
       }
 
@@ -92,7 +88,7 @@ class EntityOperation {
     catch (err) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -106,6 +102,6 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(ctx, err) { return err }
+  _unexpected(ctx, err) { return err }
 }
 

package/project/.sdk/src/cmp/js/fragment/EntityRemoveOp.fragment.js

@@ -1,16 +1,12 @@
 
 class EntityOperation {
 
-  #match
-  #data
-  #utility
-
 
   // EJECT-START
 
   async remove(reqmatch, ctrl) {
 
-    const utility = this.#utility
+    const utility = this._utility
 
     const {
       makeContext,
@@ -29,8 +25,8 @@ class EntityOperation {
     let ctx = makeContext({
       opname: 'remove',
       ctrl,
-      match: this.#match,
-      data: this.#data,
+      match: this._match,
+      data: this._data,
       reqmatch
     }, this._entctx)
 
@@ -80,11 +76,11 @@ class EntityOperation {
 
       if (null != ctx.result) {
         if (null != ctx.result.resmatch) {
-          this.#match = ctx.result.resmatch
+          this._match = ctx.result.resmatch
         }
 
         if (null != ctx.result.resdata) {
-          this.#data = ctx.result.resdata
+          this._data = ctx.result.resdata
         }
       }
 
@@ -93,7 +89,7 @@ class EntityOperation {
     catch (err) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -107,7 +103,7 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(ctx, err) { return err }
+  _unexpected(ctx, err) { return err }
 
 }
 

package/project/.sdk/src/cmp/js/fragment/EntityUpdateOp.fragment.js

@@ -1,16 +1,12 @@
 
 class EntityOperation {
 
-  #match
-  #data
-  #utility
-
 
   // EJECT-START
 
   async update(reqdata, ctrl) {
 
-    const utility = this.#utility
+    const utility = this._utility
 
     const {
       makeContext,
@@ -29,8 +25,8 @@ class EntityOperation {
     let ctx = makeContext({
       opname: 'update',
       ctrl,
-      match: this.#match,
-      data: this.#data,
+      match: this._match,
+      data: this._data,
       reqdata
     }, this._entctx)
 
@@ -80,11 +76,11 @@ class EntityOperation {
 
       if (null != ctx.result) {
         if (null != ctx.result.resmatch) {
-          this.#match = ctx.result.resmatch
+          this._match = ctx.result.resmatch
         }
 
         if (null != ctx.result.resdata) {
-          this.#data = ctx.result.resdata
+          this._data = ctx.result.resdata
         }
       }
 
@@ -93,7 +89,7 @@ class EntityOperation {
     catch (err) {
       // #PreUnexpected-Hook
 
-      err = this.#unexpected(ctx, err)
+      err = this._unexpected(ctx, err)
 
       if (err) {
         throw err
@@ -107,7 +103,7 @@ class EntityOperation {
   // EJECT-END
 
 
-  #unexpected(ctx, err) { return err }
+  _unexpected(ctx, err) { return err }
 
 }
 

package/project/.sdk/src/cmp/js/fragment/Main.fragment.js

@@ -3,6 +3,7 @@ const { inspect } = require('node:util')
 
 const { config } = require('./Config')
 const { Utility } = require('./utility/Utility')
+const { ProjectNameEntityBase } = require('./ProjectNameEntityBase')
 
 
 const { BaseFeature } = require('./feature/base/BaseFeature')
@@ -225,6 +226,7 @@ module.exports = {
   stdutil,
 
   BaseFeature,
+  ProjectNameEntityBase,
 
   ProjectNameSDK,
   SDK,

package/project/.sdk/src/cmp/js/fragment/SdkError.fragment.js

@@ -1,6 +1,4 @@
 
-const { Context } = require('./Context')
-
 
 class ProjectNameError extends Error {
 

package/project/.sdk/src/cmp/lua/Config_lua.ts

@@ -36,8 +36,12 @@ const Config = cmp(async function Config(props: any) {
   const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
-  const authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`)
-  const baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`)
+
+  let authPrefix = ''
+  try { authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`) } catch (_e) { }
+
+  let baseUrl = ''
+  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
   File({ name: 'config.' + target.ext }, () => {
 

package/project/.sdk/src/cmp/lua/TestEntity_lua.ts

@@ -75,6 +75,8 @@ local sdk = require("${model.name}_sdk")
 local helpers = require("core.helpers")
 local runner = require("test.runner")
 
+local _test_dir = debug.getinfo(1, "S").source:match("^@(.+/)")  or "./"
+
 describe("${entity.Name}Entity", function()
   it("should create instance", function()
     local testsdk = sdk.test(nil, nil)
@@ -120,7 +122,7 @@ end)
     Content(`function ${entity.name}_basic_setup(extra)
   runner.load_env_local()
 
-  local entity_data_file = "../../.sdk/test/entity/${entity.name}/${entity.Name}TestData.json"
+  local entity_data_file = _test_dir .. "../../.sdk/test/entity/${entity.name}/${entity.Name}TestData.json"
   local f = io.open(entity_data_file, "r")
   if f == nil then
     error("failed to read ${entity.name} test data: " .. entity_data_file)

package/project/.sdk/src/cmp/php/Config_php.ts

@@ -36,8 +36,12 @@ const Config = cmp(async function Config(props: any) {
   const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
-  const authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`)
-  const baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`)
+
+  let authPrefix = ''
+  try { authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`) } catch (_e) { }
+
+  let baseUrl = ''
+  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
   File({ name: 'config.' + target.ext }, () => {
 

package/project/.sdk/src/cmp/php/TestDirect_php.ts

@@ -204,7 +204,7 @@ function ${entity.name}_direct_setup($mockres)
 {
     Runner::load_env_local();
 
-    $calls = [];
+    $calls = new \\ArrayObject();
 
     $env = Runner::env_override([
         "${entidEnvVar}" => [],
@@ -227,7 +227,7 @@ function ${entity.name}_direct_setup($mockres)
         ];
     }
 
-    $mock_fetch = function ($url, $init) use (&$calls, $mockres) {
+    $mock_fetch = function ($url, $init) use ($calls, $mockres) {
         $calls[] = ["url" => $url, "init" => $init];
         return [
             [

package/project/.sdk/src/cmp/php/TestEntity_php.ts

@@ -138,17 +138,12 @@ class ${entity.Name}EntityTest extends TestCase
 
 `)
 
-    // Generate idmap via Vs::transform
-    Content(`    // Generate idmap via transform.
-    $idmap = Vs::transform(
-        [${idnamesStr}],
-        [
-            "\`\\$PACK\`" => ["", [
-                "\`\\$KEY\`" => "\`\\$COPY\`",
-                "\`\\$VAL\`" => ["\`\\$FORMAT\`", "upper", "\`\\$COPY\`"],
-            ]],
-        ]
-    );
+    // Generate idmap: key => UPPER(key)
+    Content(`    // Generate idmap.
+    $idmap = [];
+    foreach ([${idnamesStr}] as $k) {
+        $idmap[$k] = strtoupper($k);
+    }
 
 `)
 
@@ -307,18 +302,18 @@ const generateList: OpGen = (ctx, step, index) => {
       if ('ItemExists' === validator.apply && hasRefData) {
         const refDataVar = validRef + '_data'
         Content(`
-        $found_item = Vs::select(
+        $found_item = sdk_select(
             Runner::entity_list_to_data($${listvar}_result),
             ["id" => $${refDataVar}["id"]]);
-        $this->assertFalse(Vs::isempty($found_item));
+        $this->assertNotEmpty($found_item);
 `)
       } else if ('ItemNotExists' === validator.apply && hasRefData) {
         const refDataVar = validRef + '_data'
         Content(`
-        $not_found_item = Vs::select(
+        $not_found_item = sdk_select(
             Runner::entity_list_to_data($${listvar}_result),
             ["id" => $${refDataVar}["id"]]);
-        $this->assertTrue(Vs::isempty($not_found_item));
+        $this->assertEmpty($not_found_item);
 `)
       }
     }

package/project/.sdk/src/cmp/py/Config_py.ts

@@ -36,8 +36,12 @@ const Config = cmp(async function Config(props: any) {
   const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
-  const authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`)
-  const baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`)
+
+  let authPrefix = ''
+  try { authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`) } catch (_e) { }
+
+  let baseUrl = ''
+  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
   File({ name: 'config.' + target.ext }, () => {
 

package/project/.sdk/src/cmp/py/TestEntity_py.ts

@@ -78,6 +78,8 @@ import pytest
 from utility.voxgig_struct import voxgig_struct as vs
 from ${model.name}_sdk import ${model.const.Name}SDK
 from core import helpers
+
+_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 from test import runner
 
 
@@ -121,7 +123,7 @@ class Test${entity.Name}Entity:
 def ${entity.name}_basic_setup(extra):
     runner.load_env_local()
 
-    entity_data_file = "../../.sdk/test/entity/${entity.name}/${entity.Name}TestData.json"
+    entity_data_file = os.path.join(_TEST_DIR, "../../.sdk/test/entity/${entity.name}/${entity.Name}TestData.json")
     with open(entity_data_file, "r") as f:
         entity_data_source = f.read()
 

package/project/.sdk/src/cmp/rb/Config_rb.ts

@@ -36,8 +36,12 @@ const Config = cmp(async function Config(props: any) {
   const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
-  const authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`)
-  const baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`)
+
+  let authPrefix = ''
+  try { authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`) } catch (_e) { }
+
+  let baseUrl = ''
+  try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
   File({ name: 'config.' + target.ext }, () => {
 

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

@@ -36,6 +36,13 @@ const Main = cmp(async function Main(props: any) {
 
   Package({ target })
 
+  Copy({
+    from: 'tm/' + target.name,
+    replace: {
+      ...props.ctx$.stdrep,
+    }
+  })
+
   Folder({ name: 'src' }, () => {
 
     SdkError({ target })

package/project/.sdk/tm/go/feature/log_feature.go

@@ -117,7 +117,7 @@ func (f *LogFeature) loghook(hook string, ctx *core.Context, level string) {
 	}
 
 	if ctx.Spec != nil {
-		attrs = append(attrs, "spec", ctx.Spec.Name)
+		attrs = append(attrs, "spec", ctx.Spec.Method+" "+ctx.Spec.Path)
 	}
 
 	switch level {

package/project/.sdk/tm/go/test/runner_test.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strings"
 	"sync"
@@ -140,7 +141,7 @@ func runset(t *testing.T, testspec map[string]any, subject RunSubject) {
 			if expectedErr != nil {
 				errMsg := err.Error()
 				if expStr, ok := expectedErr.(string); ok {
-					if !strings.Contains(errMsg, expStr) {
+					if !matchString(expStr, errMsg) {
 						t.Errorf("entry %d%s: error mismatch: got %q, want contains %q",
 							i, mark, errMsg, expStr)
 					}
@@ -272,7 +273,7 @@ func matchDeep(t *testing.T, entryIdx int, mark string, check any, base any, pat
 		if !reflect.DeepEqual(normCheck, normBase) {
 			if isStr && checkStr != "" {
 				baseStr := vs.Stringify(base)
-				if strings.Contains(strings.ToLower(baseStr), strings.ToLower(checkStr)) {
+				if matchString(checkStr, baseStr) {
 					return
 				}
 			}
@@ -282,6 +283,19 @@ func matchDeep(t *testing.T, entryIdx int, mark string, check any, base any, pat
 	}
 }
 
+// matchString checks if val matches pattern. If pattern is /regex/, use regexp;
+// otherwise do case-insensitive contains.
+func matchString(pattern string, val string) bool {
+	if len(pattern) >= 2 && pattern[0] == '/' && pattern[len(pattern)-1] == '/' {
+		re, err := regexp.Compile(pattern[1 : len(pattern)-1])
+		if err != nil {
+			return false
+		}
+		return re.MatchString(val)
+	}
+	return strings.Contains(strings.ToLower(val), strings.ToLower(pattern))
+}
+
 // makeCtxFromMap creates a Context from a JSON test entry's ctx or args map.
 func makeCtxFromMap(ctxmap map[string]any, client *sdk.ProjectNameSDK, utility *sdk.Utility) *sdk.Context {
 	if ctxmap == nil {

package/project/.sdk/tm/js/src/Context.js

@@ -0,0 +1,142 @@
+
+const { inspect } = require('node:util')
+
+const { ProjectNameError } = require('./ProjectNameError')
+
+const { getprop, setprop, getpath } = require('./utility/StructUtility')
+
+const { Operation } = require('./Operation')
+const { Response } = require('./Response')
+const { Result } = require('./Result')
+const { Spec } = require('./Spec')
+
+
+// TODO: move to own file
+class Context {
+
+  id = 'C' + ('' + Math.random()).substring(2, 10)
+
+  // Store the output of each operation step.
+  out = {}
+
+  // Store for the current operation.
+  current = new WeakMap()
+
+
+  ctrl = {}
+  meta = {}
+
+  client
+  utility
+
+  op
+  point
+
+  config
+  entopts
+  options
+
+  opmap
+
+  response
+  result
+  spec
+
+  data
+  reqdata
+  match
+  reqmatch
+
+  entity
+
+  // Shared persistent store.
+  shared
+
+
+  constructor(ctxmap, basectx) {
+    this.client = getprop(ctxmap, 'client', getprop(basectx, 'client'))
+    this.utility = getprop(ctxmap, 'utility', getprop(basectx, 'utility'))
+
+    this.ctrl = getprop(ctxmap, 'ctrl', getprop(basectx, 'ctrl', this.ctrl))
+    this.meta = getprop(ctxmap, 'meta', getprop(basectx, 'meta', this.meta))
+
+    this.config = getprop(ctxmap, 'config', getprop(basectx, 'config'))
+    this.entopts = getprop(ctxmap, 'entopts', getprop(basectx, 'entopts'))
+    this.options = getprop(ctxmap, 'options', getprop(basectx, 'options'))
+
+    this.entity = getprop(ctxmap, 'entity', getprop(basectx, 'entity'))
+    this.shared = getprop(ctxmap, 'shared', getprop(basectx, 'shared'))
+    this.opmap = getprop(ctxmap, 'opmap', getprop(basectx, 'opmap'))
+
+    this.data = getprop(ctxmap, 'data', {})
+    this.reqdata = getprop(ctxmap, 'reqdata', {})
+    this.match = getprop(ctxmap, 'match', {})
+    this.reqmatch = getprop(ctxmap, 'reqmatch', {})
+
+    this.point = getprop(ctxmap, 'point', getprop(basectx, 'point'))
+    this.spec = getprop(ctxmap, 'spec', getprop(basectx, 'spec'))
+    this.result = getprop(ctxmap, 'result', getprop(basectx, 'result'))
+    this.response = getprop(ctxmap, 'response', getprop(basectx, 'response'))
+
+    const opname = getprop(ctxmap, 'opname')
+    this.op = this.resolveOp(opname)
+  }
+
+
+  resolveOp(opname) {
+    let op = getprop(this.opmap, opname)
+
+    if (null == op && null != opname) {
+      const entname = getprop(this.entity, 'name', '')
+      const opcfg = getpath(this.config, ['entity', entname, 'op', opname])
+      let input = 'match'
+
+      if ('update' === opname || 'create' === opname) {
+        input = 'data'
+      }
+
+      op = new Operation({
+        entity: entname,
+        name: opname,
+        input,
+        points: getprop(opcfg, 'points', [])
+      })
+
+      setprop(this.opmap, opname, op)
+    }
+
+    return op
+  }
+
+
+  error(code, msg) {
+    return new ProjectNameError(code, msg, this)
+  }
+
+
+  toJSON() {
+    return {
+      id: this.id,
+      op: this.op,
+      spec: this.spec,
+      entity: this.entity,
+      result: this.result,
+      response: this.response,
+      meta: this.meta,
+    }
+  }
+
+  toString() {
+    return 'Context ' + this.utility?.struct.jsonify(this.toJSON())
+  }
+
+  [inspect.custom]() {
+    return this.toString()
+  }
+
+}
+
+
+module.exports = {
+  Context,
+}

package/project/.sdk/tm/js/src/Control.js

@@ -0,0 +1,16 @@
+
+const { getprop } = require('./utility/StructUtility')
+
+
+class Control {
+  constructor(ctrlmap) {
+    this.throw = getprop(ctrlmap, 'throw')
+    this.err = getprop(ctrlmap, 'err')
+    this.explain = getprop(ctrlmap, 'explain')
+  }
+}
+
+
+module.exports = {
+  Control,
+}

package/project/.sdk/tm/js/src/Operation.js

@@ -0,0 +1,19 @@
+
+const { getprop } = require('./utility/StructUtility')
+
+const { Point } = require('./Point')
+
+
+class Operation {
+  constructor(opmap) {
+    this.entity = getprop(opmap, 'entity', '_')
+    this.name = getprop(opmap, 'name', '_')
+    this.input = getprop(opmap, 'input', '_')
+    this.points = getprop(opmap, 'points', [])
+  }
+}
+
+
+module.exports = {
+  Operation,
+}

package/project/.sdk/tm/js/src/Point.js

@@ -0,0 +1,24 @@
+
+const { getprop } = require('./utility/StructUtility')
+
+
+class Point {
+  constructor(altmap) {
+    this.args = getprop(altmap, 'args', { params: [] })
+    this.rename = getprop(altmap, 'rename', { params: {} })
+    this.method = getprop(altmap, 'method', '')
+    this.orig = getprop(altmap, 'orig', '')
+    this.parts = getprop(altmap, 'parts', [])
+    this.params = getprop(altmap, 'params', [])
+    this.select = getprop(altmap, 'select')
+    this.active = getprop(altmap, 'active', false)
+    this.relations = getprop(altmap, 'relations', [])
+    this.alias = getprop(altmap, 'alias', {})
+    this.transform = getprop(altmap, 'transform', { req: undefined, res: undefined })
+  }
+}
+
+
+module.exports = {
+  Point,
+}

package/project/.sdk/tm/js/src/README.md

@@ -0,0 +1 @@
+# src

package/project/.sdk/tm/js/src/Response.js

@@ -0,0 +1,19 @@
+
+const { getprop } = require('./utility/StructUtility')
+
+
+class Response {
+  constructor(resmap) {
+    this.status = getprop(resmap, 'status', -1)
+    this.statusText = getprop(resmap, 'statusText', '')
+    this.headers = getprop(resmap, 'headers')
+    this.json = resmap.json ? resmap.json.bind(resmap) : async () => undefined
+    this.body = getprop(resmap, 'body')
+    this.err = getprop(resmap, 'err')
+  }
+}
+
+
+module.exports = {
+  Response,
+}