@voxgig/sdkgen 0.25.0 → 0.26.1

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

@@ -15,24 +15,24 @@
  */
 
 
-
 import { addfeature } from './AddfeatureUtility'
 import { auth } from './AuthUtility'
 import { body } from './BodyUtility'
 import { clean } from './CleanUtility'
-import { contextify } from './ContextUtility'
 import { done } from './DoneUtility'
 import { error } from './ErrorUtility'
-import { featurehook } from './FeaturehookUtility'
+import { featureHook } from './FeatureHookUtility'
 import { fetcher } from './FetcherUtility'
 import { findparam } from './FindparamUtility'
 import { fullurl } from './FullurlUtility'
 import { headers } from './HeadersUtility'
 import { initfeature } from './InitfeatureUtility'
+import { makeContext } from './ContextUtility'
+import { makeOperation } from './OperationUtility'
 import { method } from './MethodUtility'
-import { operator, opify } from './OperatorUtility'
 import { options } from './OptionsUtility'
 import { params } from './ParamsUtility'
+import { preparePath } from './PreparePathUtility'
 import { query } from './QueryUtility'
 import { reqform } from './ReqformUtility'
 import { request } from './RequestUtility'
@@ -42,6 +42,7 @@ import { resform } from './ResformUtility'
 import { resheaders } from './ResheadersUtility'
 import { response } from './ResponseUtility'
 import { result } from './ResultUtility'
+import { selection } from './SelectionUtility'
 import { spec } from './SpecUtility'
 
 import { StructUtility } from './StructUtility'
@@ -53,20 +54,20 @@ class Utility {
   auth = auth
   body = body
   clean = clean
-  contextify = contextify
   done = done
   error = error
-  featurehook = featurehook
+  featureHook = featureHook
   fetcher = fetcher
   findparam = findparam
   fullurl = fullurl
   headers = headers
   initfeature = initfeature
+  makeContext = makeContext
+  makeOperation = makeOperation
   method = method
-  operator = operator
-  opify = opify
   options = options
   params = params
+  preparePath = preparePath
   query = query
   reqform = reqform
   request = request
@@ -76,6 +77,7 @@ class Utility {
   resheaders = resheaders
   response = response
   result = result
+  selection = selection
   spec = spec
 
   struct = new StructUtility()

package/project/.sdk/tm/ts/test/exists.test.ts

@@ -10,7 +10,6 @@ describe('exists', async () => {
 
   test('test-mode', async () => {
     const testsdk = await ProjectNameSDK.test()
-    // console.log('testsdk', testsdk)
     equal(null !== testsdk, true)
   })
 

package/project/.sdk/tm/ts/test/runner.ts

@@ -1,10 +1,10 @@
-// VERSION: @voxgig/struct 0.0.4
+// VERSION: @voxgig/struct 0.0.10
 // This test utility runs the JSON-specified tests in build/test/test.json.
 // (or .sdk/test/test.json if used in a @voxgig/sdkgen project)
 
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
-import { deepEqual, fail, AssertionError } from 'node:assert'
+import { deepStrictEqual, fail, AssertionError } from 'node:assert'
 
 const NULLMARK = '__NULL__' // Value is JSON null
 const UNDEFMARK = '__UNDEF__' // Value is not present (thus, undefined).
@@ -16,6 +16,7 @@ type RunSet = (testspec: any, testsubject: Function) => Promise<any>
 type RunSetFlags = (testspec: any, flags: Record<string, boolean>, testsubject: Function)
   => Promise<any>
 
+
 type RunPack = {
   spec: Record<string, any>
   runset: RunSet
@@ -24,6 +25,7 @@ type RunPack = {
   client: any
 }
 
+
 type TestPack = {
   name?: string
   client: any
@@ -36,9 +38,10 @@ type Flags = Record<string, boolean>
 
 type Utility = {
   struct: any
-  contextify: (ctxmap: Record<string, any>) => any
+  makeContext: (ctxmap: Record<string, any>, basectx?: any) => any
 }
 
+
 type Client = {
   utility: () => Utility
 }
@@ -80,7 +83,7 @@ async function makeRunner(testfile: string, client: Client) {
           res = fixJSON(res, flags)
           entry.res = res
 
-          checkResult(entry, res, structUtils)
+          checkResult(entry, args, res, structUtils)
         }
         catch (err: any) {
           if (err instanceof AssertionError) {
@@ -110,8 +113,7 @@ async function makeRunner(testfile: string, client: Client) {
 
 function resolveSpec(name: string, testfile: string): Record<string, any> {
   const alltests =
-    JSON.parse(readFileSync(join(
-      __dirname, testfile), 'utf8'))
+    JSON.parse(readFileSync(join(__dirname, testfile), 'utf8'))
 
   let spec = alltests.primary?.[name] || alltests[name] || alltests
   return spec
@@ -163,7 +165,7 @@ function resolveEntry(entry: any, flags: Flags): any {
 }
 
 
-function checkResult(entry: any, res: any, structUtils: Record<string, any>) {
+function checkResult(entry: any, args: any[], res: any, structUtils: Record<string, any>) {
   let matched = false
 
   if (entry.err) {
@@ -172,7 +174,7 @@ function checkResult(entry: any, res: any, structUtils: Record<string, any>) {
   }
 
   if (entry.match) {
-    const result = { in: entry.in, out: entry.res, ctx: entry.ctx }
+    const result = { in: entry.in, args, out: entry.res, ctx: entry.ctx }
     match(
       entry.match,
       result,
@@ -193,7 +195,7 @@ function checkResult(entry: any, res: any, structUtils: Record<string, any>) {
     return
   }
 
-  deepEqual(null != res ? JSON.parse(JSON.stringify(res)) : res, entry.out)
+  deepStrictEqual(null != res ? JSON.parse(JSON.stringify(res)) : res, entry.out)
 }
 
 
@@ -251,7 +253,7 @@ function resolveArgs(
     let first = args[0]
     if (structUtils.ismap(first)) {
       first = structUtils.clone(first)
-      first = utility.contextify(first)
+      first = utility.makeContext(first)
       args[0] = first
       entry.ctx = first
 

package/project/.sdk/tm/ts/test/utility/Custom.test.ts

@@ -4,38 +4,39 @@ import { equal } from 'node:assert'
 
 import { ProjectNameSDK } from '../..'
 
-const client = ProjectNameSDK.test({}, {
-  apikey: 'APIKEY01',
-
-  // NOTE: original utility.options must remain in place.
-  utility: {
-    auth: () => ({ util: 'AUTH' }),
-    body: () => ({ util: 'BODY' }),
-    contextify: () => ({ util: 'CONTEXTIFY' }),
-    done: () => ({ util: 'DONE' }),
-    error: () => ({ util: 'ERROR' }),
-    findparam: () => ({ util: 'FINDPARAM' }),
-    fullurl: () => ({ util: 'FULLURL' }),
-    headers: () => ({ util: 'HEADERS' }),
-    method: () => ({ util: 'METHOD' }),
-    operator: () => ({ util: 'OPERATOR' }),
-    params: () => ({ util: 'PARAMS' }),
-    query: () => ({ util: 'QUERY' }),
-    reqform: () => ({ util: 'REQFORM' }),
-    request: () => ({ util: 'REQUEST' }),
-    resbasic: () => ({ util: 'RESBASIC' }),
-    resbody: () => ({ util: 'RESBODY' }),
-    resform: () => ({ util: 'RESFORM' }),
-    resheaders: () => ({ util: 'RESHEADERS' }),
-    response: () => ({ util: 'RESPONSE' }),
-    result: () => ({ util: 'RESULT' }),
-    spec: () => ({ util: 'SPEC' }),
-  }
-})
-
 
 describe('Custom', () => {
+
   test('basic', async () => {
+    const client = ProjectNameSDK.test({}, {
+      apikey: 'APIKEY01',
+
+      // NOTE: original utility.options must remain in place.
+      utility: {
+        auth: () => ({ util: 'AUTH' }),
+        body: () => ({ util: 'BODY' }),
+        contextify: () => ({ util: 'CONTEXTIFY' }),
+        done: () => ({ util: 'DONE' }),
+        error: () => ({ util: 'ERROR' }),
+        findparam: () => ({ util: 'FINDPARAM' }),
+        fullurl: () => ({ util: 'FULLURL' }),
+        headers: () => ({ util: 'HEADERS' }),
+        method: () => ({ util: 'METHOD' }),
+        operator: () => ({ util: 'OPERATOR' }),
+        params: () => ({ util: 'PARAMS' }),
+        query: () => ({ util: 'QUERY' }),
+        reqform: () => ({ util: 'REQFORM' }),
+        request: () => ({ util: 'REQUEST' }),
+        resbasic: () => ({ util: 'RESBASIC' }),
+        resbody: () => ({ util: 'RESBODY' }),
+        resform: () => ({ util: 'RESFORM' }),
+        resheaders: () => ({ util: 'RESHEADERS' }),
+        response: () => ({ util: 'RESPONSE' }),
+        result: () => ({ util: 'RESULT' }),
+        spec: () => ({ util: 'SPEC' }),
+      }
+    })
+
     const u: any = client.utility()
 
     equal(u.auth().util, 'AUTH')

package/project/.sdk/tm/ts/test/utility/PrimaryUtility.test.ts

@@ -1,6 +1,6 @@
 
-import { test, describe } from 'node:test'
-import { equal, deepEqual } from 'node:assert'
+import { test, describe, before } from 'node:test'
+import { equal } from 'node:assert'
 
 import {
   makeRunner,
@@ -15,8 +15,39 @@ import {
 
 describe('PrimaryUtility', async () => {
 
-  const client = SDK.test()
-  const runner = await makeRunner(TEST_JSON_FILE, client)
+  let client: any
+  let runner: any
+  let runners: any
+
+  before(async () => {
+    client = SDK.test()
+    runner = await makeRunner(TEST_JSON_FILE, client)
+
+    runners = {
+      auth: await runner('auth'),
+      body: await runner('body'),
+      // makeContext: await runner('makeContext'),
+      done: await runner('done'),
+      error: await runner('error'),
+      findparam: await runner('findparam'),
+      fullurl: await runner('fullurl'),
+      headers: await runner('headers'),
+      method: await runner('method'),
+      operator: await runner('operator'),
+      options: await runner('options'),
+      params: await runner('params'),
+      query: await runner('query'),
+      reqform: await runner('reqform'),
+      request: await runner('request', { fetch: MockFetch }),
+      resbasic: await runner('resbasic'),
+      resbody: await runner('resbody'),
+      resform: await runner('resform'),
+      resheaders: await runner('resheaders'),
+      response: await runner('response'),
+      spec: await runner('spec'),
+    }
+
+  })
 
 
   async function MockFetch(url: string, fetchdef: any) {
@@ -47,41 +78,16 @@ describe('PrimaryUtility', async () => {
   }
 
 
-  const runners = {
-    auth: await runner('auth'),
-    body: await runner('body'),
-    contextify: await runner('contextify'),
-    done: await runner('done'),
-    error: await runner('error'),
-    findparam: await runner('findparam'),
-    fullurl: await runner('fullurl'),
-    headers: await runner('headers'),
-    method: await runner('method'),
-    operator: await runner('operator'),
-    options: await runner('options'),
-    params: await runner('params'),
-    query: await runner('query'),
-    reqform: await runner('reqform'),
-    request: await runner('request', { fetch: MockFetch }),
-    resbasic: await runner('resbasic'),
-    resbody: await runner('resbody'),
-    resform: await runner('resform'),
-    resheaders: await runner('resheaders'),
-    response: await runner('response'),
-    spec: await runner('spec'),
-  }
-
-
   test('exists', async () => {
     equal('function', typeof runners.auth.subject)
     equal('function', typeof runners.body.subject)
-    equal('function', typeof runners.contextify.subject)
+    // equal('function', typeof runners.makeContext.subject)
     equal('function', typeof runners.done.subject)
     equal('function', typeof runners.error.subject)
     equal('function', typeof runners.findparam.subject)
     equal('function', typeof runners.fullurl.subject)
     equal('function', typeof runners.method.subject)
-    equal('function', typeof runners.operator.subject)
+    // equal('function', typeof runners.operator.subject)
     equal('function', typeof runners.options.subject)
     equal('function', typeof runners.params.subject)
     equal('function', typeof runners.query.subject)
@@ -111,16 +117,16 @@ describe('PrimaryUtility', async () => {
   // })
 
 
-  test('contextify-basic', async () => {
-    const { runset, spec, subject } = runners.contextify
-    await runset(spec.basic, subject)
-  })
+  // test('makeContext-basic', async () => {
+  //   const { runset, spec, subject } = runners.makeContext
+  //   await runset(spec.basic, subject)
+  // })
 
 
-  test('done-basic', async () => {
-    const { runset, spec, subject } = runners.done
-    await runset(spec.basic, subject)
-  })
+  // test('done-basic', async () => {
+  //   const { runset, spec, subject } = runners.done
+  //   await runset(spec.basic, subject)
+  // })
 
 
   // test('error-basic', async () => {
@@ -147,10 +153,10 @@ describe('PrimaryUtility', async () => {
   // })
 
 
-  test('method-basic', async () => {
-    const { runset, spec, subject } = runners.method
-    await runset(spec.basic, subject)
-  })
+  // test('method-basic', async () => {
+  //   const { runset, spec, subject } = runners.method
+  //   await runset(spec.basic, subject)
+  // })
 
 
   // test('operator-basic', async () => {
@@ -210,10 +216,10 @@ describe('PrimaryUtility', async () => {
   // })
 
 
-  test('resform-basic', async () => {
-    const { runset, spec, subject } = runners.resform
-    await runset(spec.basic, subject)
-  })
+  // test('resform-basic', async () => {
+  //   const { runset, spec, subject } = runners.resform
+  //   await runset(spec.basic, subject)
+  // })
 
 
   // test('resheaders-basic', async () => {