@voxgig/sdkgen 4.2.7 → 4.3.0

package/src/helpers/naming.ts

@@ -149,9 +149,9 @@ const RB_SDK_CONSTANTS = new Set<string>([
   'StructRunner', 'StructTestClient', 'StructUtilityTest', 'VoxgigStruct',
   'STRUCT_TEST_JSON_FILE',
   // the generated/templated test classes
-  'ExistsTest', 'FeatureTest', 'NetsimTest', 'PipelineTest',
-  'PrimaryUtilityTest', 'ReadmeExamplesTest', 'TestHookFeature',
-  'TestInitFeature',
+  'ExistsTest', 'FeatureCorpusTest', 'FeatureTest', 'NetsimTest',
+  'PipelineTest', 'PrimaryUtilityTest', 'ReadmeExamplesTest',
+  'TestHookFeature', 'TestInitFeature',
 ])
 
 
@@ -304,18 +304,59 @@ function isPhpReservedType(Name: string): boolean {
 }
 
 
-// A declarable PHP class name for a generated type: unchanged, unless PHP
-// reserves the word, in which case `Type` is appended (`Namespace` ->
-// `NamespaceType`). Mirrors rbSafeTypeName and swiftSafeTypeName deliberately
-// — same suffix, same "only rename on an actual collision" rule, so every SDK
-// that does not collide is byte-identical to before.
+// CLASSES THE GENERATED PHP SDK ITSELF DECLARES — the second half of "already
+// taken", exactly as RB_SDK_CONSTANTS is for ruby. `PHP_RESERVED_TYPES` covers
+// what the LANGUAGE owns; this covers what OUR OWN scaffolding claims, which a
+// keyword list can never catch.
+//
+// The generated PHP SDK uses NO NAMESPACES, and composer classmaps both the
+// runtime (`types/`) and the tests (`autoload-dev`: `test/`). An entity named
+// `feature_test` emits `class FeatureTest` in `<Sdk>Types.php` while
+// `tm/php/test/FeatureTest.php` declares one too: composer maps one name to
+// two files, and loading both fatals on redeclaration. Ruby's equivalent only
+// warns; PHP does not.
+//
+// Only UNPREFIXED, UNNAMESPACED declarations are listed. `ProjectNameUtility`
+// substitutes to `<Sdk>Utility`, which no bare entity type can equal, and
+// `utility/struct/Struct.php` and `test/StructRunner.php` declare inside a
+// namespace — neither is reachable from the global name an entity type takes.
+//
+// `php-sdk-classes.test.ts` re-derives this from the templates AND the
+// components and fails on drift, the same discipline as the rb and swift
+// guards, and for the same reason: a hand-collected list rots.
+//
+// Folded, and matched folded: PHP class names are case-insensitive, so
+// `FeatureTest` and `featuretest` are one identifier.
+const PHP_SDK_CLASSES = new Set<string>([
+  // the generated/templated test classes
+  'existstest', 'featurecorpustest', 'featuretest', 'netsimtest',
+  'pipelinetest', 'primaryutilitytest', 'readmeexamplestest',
+  'structutilitytest',
+  // helper classes those suites declare beside them
+  'ftclient', 'ftclock', 'ftctrl', 'ftentity', 'ftharness', 'ftrecorder',
+  'plclient', 'plentity', 'plentityitem',
+])
+
+
+// Does `Name` collide with a class the generated PHP SDK already declares?
+function isPhpSdkClass(Name: string): boolean {
+  return PHP_SDK_CLASSES.has(String(Name).toLowerCase())
+}
+
+
+// A declarable PHP class name for a generated type: unchanged, unless the name
+// is ALREADY TAKEN — by PHP itself, or by the SDK's own scaffolding — in which
+// case `Type` is appended (`Namespace` -> `NamespaceType`). Mirrors
+// rbSafeTypeName and swiftSafeTypeName deliberately — same suffix, same "only
+// rename on an actual collision" rule, so every SDK that does not collide is
+// byte-identical to before.
 //
 // Applied ONLY to the bare entity data class. Per-op type names already carry
-// their own suffix (`NamespaceLoadData`, `NamespaceCreateData`), which no
-// reserved word matches, and the entity ACCESSOR is a method rather than a
-// class — PHP resolves those separately — so the public surface is unchanged.
+// their own suffix (`NamespaceLoadData`, `NamespaceCreateData`), which neither
+// set matches, and the entity ACCESSOR is a method rather than a class — PHP
+// resolves those separately — so the public surface is unchanged.
 function phpSafeTypeName(Name: string): string {
-  return isPhpReservedType(Name) ? Name + 'Type' : Name
+  return isPhpReservedType(Name) || isPhpSdkClass(Name) ? Name + 'Type' : Name
 }
 
 
@@ -496,6 +537,7 @@ export {
   isSwiftSdkType,
   swiftSafeTypeName,
   isPhpReservedType,
+  isPhpSdkClass,
   phpSafeTypeName,
   isTsReservedType,
   tsSafeTypeName,

package/src/sdkgen.ts

@@ -59,7 +59,7 @@ import { collectDeps } from './helpers/collectDeps'
 import type { DepEntry } from './helpers/collectDeps'
 import { canonToType, canonToDtype, canonKey, canonScalarKey } from './helpers/canonType'
 import { OP_SUFFIX, opTypeName, opParams, ownPoint, opActions, entityActions, entityPath, opRequestShape, entityIdField, entityDataIdField, entityOps, entityPrimaryOp, pickExampleEntity, entityClassName, entityTypeCollisions, warnEntityTypeCollisions, deriveEntityNames, entityCollection } from './helpers/opShape'
-import { isReservedName, safeVarName, exampleVarName, phpEntityAccessor, entityCacheField, isRbCoreConstant, isRbSdkConstant, rbSafeTypeName, isSwiftSdkType, swiftSafeTypeName, isPhpReservedType, phpSafeTypeName, isTsReservedType, tsSafeTypeName, jsProp, jsOptProp, jsKey } from './helpers/naming'
+import { isReservedName, safeVarName, exampleVarName, phpEntityAccessor, entityCacheField, isRbCoreConstant, isRbSdkConstant, rbSafeTypeName, isSwiftSdkType, swiftSafeTypeName, isPhpReservedType, isPhpSdkClass, phpSafeTypeName, isTsReservedType, tsSafeTypeName, jsProp, jsOptProp, jsKey } from './helpers/naming'
 import { serverVariables, hasServerVariables } from './helpers/serverVars'
 import { primaryOpCall, idLiteral, matchArg, dataArg, litFor } from './helpers/opExample'
 import type { ExampleLang } from './helpers/opExample'
@@ -1126,6 +1126,7 @@ export {
   isSwiftSdkType,
   swiftSafeTypeName,
   isPhpReservedType,
+  isPhpSdkClass,
   phpSafeTypeName,
   isTsReservedType,
   tsSafeTypeName,