@voxgig/sdkgen 4.28.0 → 4.30.0

package/project/.sdk/src/cmp/c/utility_c.ts

@@ -4,6 +4,8 @@ import {
   walk,
 } from '@voxgig/struct'
 
+import { sdkName } from '@voxgig/sdkgen'
+
 
 // C reserved keywords illegal as identifiers.
 const C_RESERVED = new Set<string>([
@@ -31,7 +33,7 @@ function cIdent(model: any): string {
 // Package-ish name (used in comments only), e.g. voxgig-solar-sdk.
 function cName(model: any): string {
   const org = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '')
-  return `${org}-${model.name}-sdk`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return `${org}-${sdkName(model.name)}`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 }
 
 

package/project/.sdk/src/cmp/cpp/ReadmeInstall_cpp.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, repoInfo } from '@voxgig/sdkgen'
+import { cmp, Content, repoInfo, sdkName } from '@voxgig/sdkgen'
 
 
 const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
@@ -20,7 +20,7 @@ Releases are cut as the git tag \`${target.name}/vX.Y.Z\` (see
 
 \`\`\`bash
 # Add the SDK as a submodule (or copy the cpp/ directory into your tree).
-git submodule add <repo-url> third_party/${model.const.Name.toLowerCase()}-sdk
+git submodule add <repo-url> third_party/${sdkName(model.const.Name.toLowerCase())}
 \`\`\`
 
 Then include the umbrella header and compile with C++17:
@@ -30,7 +30,7 @@ Then include the umbrella header and compile with C++17:
 \`\`\`
 
 \`\`\`bash
-g++ -std=c++17 -Ithird_party/${model.const.Name.toLowerCase()}-sdk/cpp your_app.cpp -o your_app
+g++ -std=c++17 -Ithird_party/${sdkName(model.const.Name.toLowerCase())}/cpp your_app.cpp -o your_app
 \`\`\`
 
 `)

package/project/.sdk/src/cmp/elixir/ReadmeInstall_elixir.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion, sdkName } from '@voxgig/sdkgen'
 
 
 const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
@@ -51,7 +51,7 @@ Or from a local source checkout:
 \`\`\`elixir
 def deps do
   [
-    {:${app}, path: "../${model.const.name.toLowerCase()}-sdk/${target.name}"}
+    {:${app}, path: "../${sdkName(model.const.name.toLowerCase())}/${target.name}"}
   ]
 end
 \`\`\`

package/project/.sdk/src/cmp/java/Package_java.ts

@@ -5,6 +5,7 @@ import {
   cmp,
   collectDeps,
   packageVersion,
+  sdkName,
 } from '@voxgig/sdkgen'
 
 
@@ -28,7 +29,7 @@ const Package = cmp(async function Package(props: any) {
   const model: Model = ctx$.model
 
   const groupId = mavenGroupId(model)
-  const artifactId = `${model.name}-sdk`
+  const artifactId = sdkName(model.name)
 
   // Dep name convention: "groupId:artifactId" with an explicit version.
   const deps: { groupId: string, artifactId: string, version: string, kind: string }[] = []

package/project/.sdk/src/cmp/java/ReadmeInstall_java.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion, sdkName } from '@voxgig/sdkgen'
 
 import { mavenGroupId } from './utility_java'
 
@@ -9,7 +9,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
   const { model } = ctx$
 
   const groupId = mavenGroupId(model)
-  const artifactId = `${model.name}-sdk`
+  const artifactId = sdkName(model.name)
 
   if (isPublished(model, target.name)) {
     Content(`Add the dependency to your \`pom.xml\`:

package/project/.sdk/src/cmp/js/Package_js.ts

@@ -74,8 +74,8 @@ const Package = cmp(async function Package(props: any) {
 
     // What actually ships. Without `files`, `npm publish` packs the test
     // suite and the build scaffolding too. The js target runs from `src`
-    // directly (no build step), so that is the whole package.
-    files: ['src'],
+    // directly (no build step), so that and the README are the whole package.
+    files: ['src', 'README.md'],
     scripts: {
       ...(hasLiveScenarios(model) ? {
         'test:live': `${envName(model)}_TEST_LIVE=TRUE node --test test/live.test.js`,

package/project/.sdk/src/cmp/kotlin/Package_kotlin.ts

@@ -5,6 +5,7 @@ import {
   cmp,
   collectDeps,
   packageVersion,
+  sdkName,
 } from '@voxgig/sdkgen'
 
 
@@ -27,7 +28,7 @@ const Package = cmp(async function Package(props: any) {
   const model: Model = ctx$.model
 
   const group = gradleGroup(model)
-  const artifactId = `${model.name}-sdk`
+  const artifactId = sdkName(model.name)
 
   // Dep name convention: "group:artifact" with an explicit version.
   const deps: { group: string, artifact: string, version: string, kind: string }[] = []

package/project/.sdk/src/cmp/kotlin/ReadmeInstall_kotlin.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion, sdkName } from '@voxgig/sdkgen'
 
 import { gradleGroup } from './utility_kotlin'
 
@@ -9,7 +9,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
   const { model } = ctx$
 
   const group = gradleGroup(model)
-  const artifactId = `${model.name}-sdk`
+  const artifactId = sdkName(model.name)
 
   if (isPublished(model, target.name)) {
     Content(`Add the dependency to your \`build.gradle.kts\`:

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

@@ -66,10 +66,8 @@ const Package = cmp(async function Package(props: any) {
   // Rock name is namespaced to model.origin (e.g. "voxgig-sdk"). LuaRocks has
   // no real namespaces, so the parts are hyphen-joined. The Lua module name
   // (`${model.name}_sdk`) used by `require` is unchanged.
-  const ns = model.origin || 'voxgig-sdk'
-  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
   const rockName = packageName(model, target.name)
-  const { repoUrl, issuesUrl } = repoInfo(model)
+  const { repo, repoUrl, issuesUrl } = repoInfo(model)
   const labels = keywords(model).map((k) => `"${k}"`).join(', ')
 
   // Single source for the version so the rockspec version and the source.tag
@@ -82,9 +80,9 @@ version = "${rockVersion}-1"
 source = {
   -- git+https (GitHub dropped git:// in 2022); pin the install to the release
   -- tag pushed by \`make publish\`, and point at the lua/ subdir of the monorepo.
-  url = "git+https://github.com/${ns}/${model.name}-sdk.git",
+  url = "git+${repoUrl}.git",
   tag = "lua/v${rockVersion}",
-  dir = "${model.name}-sdk/lua"
+  dir = "${repo}/lua"
 }
 description = {
   summary = "${pkgDescription(model, target.name)}",

package/project/.sdk/src/cmp/ocaml/utility_ocaml.ts

@@ -4,6 +4,8 @@ import {
   walk,
 } from '@voxgig/struct'
 
+import { sdkName } from '@voxgig/sdkgen'
+
 
 // OCaml keywords that are illegal as a lowercase identifier. sdkgen's shared
 // safeVarName has no ocaml entry, so the guard lives here.
@@ -36,7 +38,7 @@ function entityModule(name: string): string {
 // module naming: org prefix from model.origin).
 function packageName(model: any): string {
   const org = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '')
-  return `${org}-${model.name}-sdk`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return `${org}-${sdkName(model.name)}`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 }
 
 

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

@@ -31,8 +31,6 @@ const Package = cmp(async function Package(props: any) {
   // Package namespace mirrors the npm scope (model.origin, e.g. "voxgig-sdk").
   // If origin already ends in "-sdk" the slug stands alone; otherwise append
   // "-sdk" (matches the TS Package generator).
-  const ns = model.origin || 'voxgig-sdk'
-  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
   const { repoUrl, issuesUrl } = repoInfo(model)
   const kw = keywords(model).map((k) => `"${k}"`).join(', ')
 

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

@@ -22,8 +22,6 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  const ns = model.origin || 'voxgig-sdk'
-  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
   const distName = packageName(model, target.name)
   const { repoUrl, issuesUrl } = repoInfo(model)
   const kw = keywords(model).map((k) => `"${k}"`).join(', ')

package/project/.sdk/src/cmp/py-data/Main_py-data.ts

@@ -99,9 +99,7 @@ const Package = cmp(function Package(props: any) {
   const { target, model, lower, dataModule } = props
   const ctx$ = props.ctx$
 
-  const ns = model.origin || 'voxgig-sdk'
-  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
-  const distName = `${ns}-${pkgBase}-data`
+  const distName = packageName(model, target.name)
   // The `py` SDK this package WRAPS — a different target, so it keeps its
   // own name and does not follow this target's alias.
   const sdkDist = packageName(model, 'py')

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

@@ -28,32 +28,12 @@ const Package = cmp(async function Package(props: any) {
   // constant here did.
   const author = authorInfo(model, target.name)
 
-  const ns = model.origin || 'voxgig-sdk'
-  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
   const gemName = packageName(model, target.name)
   const { repoUrl, issuesUrl, changelogUrl } = repoInfo(model)
 
-  const versionOf = (d: { version: string; source: 'feature' | 'target' }) =>
-    d.source === 'target' ? (d.version || '0.0') : d.version
-
-  File({ name: 'Gemfile' }, () => {
-    Content(`source "https://rubygems.org"
-
-gemspec
-
-`)
-
-    for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
-      Content(`gem "${d.name}", "~> ${versionOf(d)}"
-`)
-    }
-  })
-
   File({ name: model.const.Name + '_sdk.gemspec' }, () => {
-    // RubyGems rejects a gemspec that declares the same runtime dependency
-    // twice (Gem::InvalidSpecificationException at `gem build`), so the
-    // unconstrained json fallback is only emitted when the model's own
-    // dependency list doesn't already declare json.
+    // `gem build` rejects a duplicate runtime dependency, so the json
+    // fallback is emitted only when the model does not declare json.
     const deps = collectDeps(model, target.name, target.deps, ctx$.log)
     const hasJson = deps.some((d: any) => 'json' === d.name)
 
@@ -91,7 +71,8 @@ ${hasJson ? '' : `
 `}`)
 
     for (const d of deps) {
-      Content(`  spec.add_dependency "${d.name}", "~> ${versionOf(d)}"
+      const req = gemRequirement(d.version)
+      Content(`  spec.add_dependency "${d.name}"${null == req ? '' : `, "${req}"`}
 `)
     }
 
@@ -104,6 +85,17 @@ end
 })
 
 
+// `~> 0` admits only 0.x releases, so an absent, `*` or all-zero version is
+// no constraint at all.
+function gemRequirement(version?: string): string | null {
+  const v = String(version ?? '').trim()
+  if ('' === v || '*' === v || /^0(\.0)*$/.test(v)) {
+    return null
+  }
+  return /^(>=|<=|~>|!=|=|>|<)/.test(v) ? v : '~> ' + v
+}
+
+
 export {
   Package
 }

package/project/.sdk/src/cmp/rust/utility_rust.ts

@@ -4,6 +4,8 @@ import {
   walk,
 } from '@voxgig/struct'
 
+import { sdkName } from '@voxgig/sdkgen'
+
 
 // Rust keywords (strict + reserved) that are illegal as an identifier.
 // sdkgen's shared safeVarName has no rust entry, so the guard lives here.
@@ -44,7 +46,7 @@ function rustVarName(name: string): string {
 
 function crateName(model: any): string {
   const org = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '')
-  return `${org}-${model.name}-sdk`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
+  return `${org}-${sdkName(model.name)}`.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 }
 
 

package/project/.sdk/src/cmp/scala/ReadmeInstall_scala.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion, sdkName } from '@voxgig/sdkgen'
 
 import { mavenGroupId } from './utility_scala'
 
@@ -9,7 +9,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
   const { model } = ctx$
 
   const groupId = mavenGroupId(model)
-  const artifactId = `${model.name}-sdk`
+  const artifactId = sdkName(model.name)
 
   if (isPublished(model, target.name)) {
     Content(`Add the dependency with scala-cli:

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

@@ -73,7 +73,7 @@ const Package = cmp(async function Package(props: any) {
     type: 'commonjs',
     types: `dist/${SdkName}SDK.d.ts`,
 
-    files: ['dist', 'src'],
+    files: ['dist', 'src', 'README.md'],
     scripts: {
       ...(hasLiveScenarios(model) ? {
         'test:live': `npm run build && ${envName(model)}_TEST_LIVE=TRUE node --test dist-test/live.test.js`,

package/project/sdkgen-package.json

@@ -3,7 +3,7 @@
     "package": 1
   },
   "name": "@voxgig/sdkgen",
-  "version": "4.28.0",
+  "version": "4.30.0",
   "provides": {
     "target": [
       "c",