@patterkit/model 0.4.0 → 0.4.1

package/dist/index.cjs

@@ -29,19 +29,20 @@ __export(index_exports, {
   PROJECT_LOCALE_SCENE: () => PROJECT_LOCALE_SCENE,
   RERECORD_STATUS: () => RERECORD_STATUS,
   RERECORD_STATUS_DECL: () => RERECORD_STATUS_DECL,
-  RESERVED_PROPERTY_NAMES: () => RESERVED_PROPERTY_NAMES,
+  RESERVED_PROPERTY_NAMES: () => import_expr.RESERVED_PROPERTY_NAMES,
   castStringKey: () => castStringKey,
   deriveRecordingFolders: () => deriveRecordingFolders,
   effectiveGameId: () => effectiveGameId,
   gameIdify: () => gameIdify,
-  isCaseOnlyPropertyName: () => isCaseOnlyPropertyName,
+  isCaseOnlyPropertyName: () => import_expr.isCaseOnlyPropertyName,
   isContentlessBeat: () => isContentlessBeat,
   isValidGameId: () => isValidGameId,
-  isValidPropertyName: () => isValidPropertyName,
-  propertyNameify: () => propertyNameify,
+  isValidPropertyName: () => import_expr.isValidPropertyName,
+  propertyNameify: () => import_expr.propertyNameify,
   walkNodes: () => walkNodes
 });
 module.exports = __toCommonJS(index_exports);
+var import_expr = require("@wildwinter/expr");
 function walkNodes(nodes, visit) {
   for (const node of nodes) {
     visit(node);
@@ -62,22 +63,6 @@ function gameIdify(text) {
 function isValidGameId(gameId) {
   return /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(gameId);
 }
-var RESERVED_PROPERTY_NAMES = ["true", "false", "and", "or", "not"];
-function propertyNameify(text) {
-  const trimmed = text.trim();
-  const deliberateLeading = trimmed.startsWith("_");
-  let out = trimmed.toLowerCase().replace(/['\u2019]/g, "").replace(/[^a-z0-9_]+/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
-  if (out === "") return "";
-  if (deliberateLeading || /^[0-9]/.test(out)) out = `_${out}`;
-  if (RESERVED_PROPERTY_NAMES.includes(out)) out = `${out}_`;
-  return out;
-}
-function isValidPropertyName(name) {
-  return /^[a-z_][a-z0-9_]*$/.test(name) && !RESERVED_PROPERTY_NAMES.includes(name);
-}
-function isCaseOnlyPropertyName(name) {
-  return !isValidPropertyName(name) && isValidPropertyName(name.toLowerCase());
-}
 function effectiveGameId(entity) {
   const g = entity.gameId?.trim();
   return g ? g : gameIdify(entity.name);

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import { AstNode } from '@wildwinter/expr';
+export { RESERVED_PROPERTY_NAMES, isCaseOnlyPropertyName, isValidPropertyName, propertyNameify } from '@wildwinter/expr';
 
 type ScalarValue = boolean | number | string | string[];
 /** Developer-defined host metadata (spec §17). Opaque to Patter. */
@@ -207,21 +208,7 @@ declare function isContentlessBeat(beat: Beat, hasText: boolean): boolean;
 declare function gameIdify(text: string): string;
 /** A valid authored game id: lowercase alphanumerics + hyphens, no leading / trailing hyphen. */
 declare function isValidGameId(gameId: string): boolean;
-/** The words `@wildwinter/expr` lexes as keywords, so no property may be called one.
- *  `packages/model/test/property-name-grammar.test.ts` probes the real parser rather
- *  than trusting this copy. */
-declare const RESERVED_PROPERTY_NAMES: readonly string[];
-/** Coerce a label into a legal property name: lower case, apostrophes dropped, runs of
- *  anything else to a single underscore, no trailing underscore, an underscore in front
- *  of a leading digit, one behind a keyword. "" when nothing usable was left. */
-declare function propertyNameify(text: string): string;
-/** Is this a name an expression can actually reach? Lower case letters, digits and
- *  underscores, not starting with a digit, not a keyword. "" is not a name. */
-declare function isValidPropertyName(name: string): boolean;
-/** True when folding case ALONE would make it legal (`isNight`). The only violation a
- *  loader may repair without guessing at intent: every reference is folded already, so
- *  folding the declaration to match changes nothing observable. */
-declare function isCaseOnlyPropertyName(name: string): boolean;
+
 /** The effective address: the explicit `gameId` if pinned, else derived from `name`. */
 declare function effectiveGameId(entity: {
     gameId?: string;
@@ -859,4 +846,4 @@ declare const DEFAULT_CAPTION_DELIMITERS: CaptionDelimiters;
  *  captions are off). Applies even to a project that pins no `closedCaptions`. */
 declare const DEFAULT_CAPTION_CHARACTER = "SFX";
 
-export { type AuthoringFile, type Beat, type Block, type Bundle, type BundleCastMember, COMMON_GENDERS, type CaptionDelimiters, type CastMember, type Comment, type CommentMessage, type CommentRange, type CompiledBlock, type CompiledEffect, type CompiledGroup, type CompiledScene, type CompiledSnippet, type CoverageDriver, DEFAULT_CAPTION_CHARACTER, DEFAULT_CAPTION_DELIMITERS, DEFAULT_DOCUMENTATION_CLASSES, DEFAULT_RECORDING_STATUSES, DEFAULT_WRITING_STATUSES, type DocLine, type DocumentationClass, type EditRecord, type Effect, type EstimatingConfig, type Expression, type FlowFile, type FlowNode, type GameData, type GameDataField, type GameDataFieldType, type GameDataFields, type GameDataNodeKind, type GameEventBeat, type GrammaticalGender, type Group, type HostScopeDecl, type HostScopeRegistry, type HostScopeSpec, type Jump, type JumpTarget, type LineBeat, type LocaleFile, PROJECT_LOCALE_SCENE, type ProjectDictionary, type ProjectFile, type PromptBeat, type PropertyDecl, type PropertyType, RERECORD_STATUS, RERECORD_STATUS_DECL, RESERVED_PROPERTY_NAMES, type RecordingFolder, type RecordingStatusDecl, type ScalarValue, type Scene, type Selector, type SelectorExhaust, type SelectorOrder, type SequenceOptions, type Snippet, type Suggestion, type TextBeat, type VcsKind, type WritingStatusDecl, castStringKey, deriveRecordingFolders, effectiveGameId, gameIdify, isCaseOnlyPropertyName, isContentlessBeat, isValidGameId, isValidPropertyName, propertyNameify, walkNodes };
+export { type AuthoringFile, type Beat, type Block, type Bundle, type BundleCastMember, COMMON_GENDERS, type CaptionDelimiters, type CastMember, type Comment, type CommentMessage, type CommentRange, type CompiledBlock, type CompiledEffect, type CompiledGroup, type CompiledScene, type CompiledSnippet, type CoverageDriver, DEFAULT_CAPTION_CHARACTER, DEFAULT_CAPTION_DELIMITERS, DEFAULT_DOCUMENTATION_CLASSES, DEFAULT_RECORDING_STATUSES, DEFAULT_WRITING_STATUSES, type DocLine, type DocumentationClass, type EditRecord, type Effect, type EstimatingConfig, type Expression, type FlowFile, type FlowNode, type GameData, type GameDataField, type GameDataFieldType, type GameDataFields, type GameDataNodeKind, type GameEventBeat, type GrammaticalGender, type Group, type HostScopeDecl, type HostScopeRegistry, type HostScopeSpec, type Jump, type JumpTarget, type LineBeat, type LocaleFile, PROJECT_LOCALE_SCENE, type ProjectDictionary, type ProjectFile, type PromptBeat, type PropertyDecl, type PropertyType, RERECORD_STATUS, RERECORD_STATUS_DECL, type RecordingFolder, type RecordingStatusDecl, type ScalarValue, type Scene, type Selector, type SelectorExhaust, type SelectorOrder, type SequenceOptions, type Snippet, type Suggestion, type TextBeat, type VcsKind, type WritingStatusDecl, castStringKey, deriveRecordingFolders, effectiveGameId, gameIdify, isContentlessBeat, isValidGameId, walkNodes };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { AstNode } from '@wildwinter/expr';
+export { RESERVED_PROPERTY_NAMES, isCaseOnlyPropertyName, isValidPropertyName, propertyNameify } from '@wildwinter/expr';
 
 type ScalarValue = boolean | number | string | string[];
 /** Developer-defined host metadata (spec §17). Opaque to Patter. */
@@ -207,21 +208,7 @@ declare function isContentlessBeat(beat: Beat, hasText: boolean): boolean;
 declare function gameIdify(text: string): string;
 /** A valid authored game id: lowercase alphanumerics + hyphens, no leading / trailing hyphen. */
 declare function isValidGameId(gameId: string): boolean;
-/** The words `@wildwinter/expr` lexes as keywords, so no property may be called one.
- *  `packages/model/test/property-name-grammar.test.ts` probes the real parser rather
- *  than trusting this copy. */
-declare const RESERVED_PROPERTY_NAMES: readonly string[];
-/** Coerce a label into a legal property name: lower case, apostrophes dropped, runs of
- *  anything else to a single underscore, no trailing underscore, an underscore in front
- *  of a leading digit, one behind a keyword. "" when nothing usable was left. */
-declare function propertyNameify(text: string): string;
-/** Is this a name an expression can actually reach? Lower case letters, digits and
- *  underscores, not starting with a digit, not a keyword. "" is not a name. */
-declare function isValidPropertyName(name: string): boolean;
-/** True when folding case ALONE would make it legal (`isNight`). The only violation a
- *  loader may repair without guessing at intent: every reference is folded already, so
- *  folding the declaration to match changes nothing observable. */
-declare function isCaseOnlyPropertyName(name: string): boolean;
+
 /** The effective address: the explicit `gameId` if pinned, else derived from `name`. */
 declare function effectiveGameId(entity: {
     gameId?: string;
@@ -859,4 +846,4 @@ declare const DEFAULT_CAPTION_DELIMITERS: CaptionDelimiters;
  *  captions are off). Applies even to a project that pins no `closedCaptions`. */
 declare const DEFAULT_CAPTION_CHARACTER = "SFX";
 
-export { type AuthoringFile, type Beat, type Block, type Bundle, type BundleCastMember, COMMON_GENDERS, type CaptionDelimiters, type CastMember, type Comment, type CommentMessage, type CommentRange, type CompiledBlock, type CompiledEffect, type CompiledGroup, type CompiledScene, type CompiledSnippet, type CoverageDriver, DEFAULT_CAPTION_CHARACTER, DEFAULT_CAPTION_DELIMITERS, DEFAULT_DOCUMENTATION_CLASSES, DEFAULT_RECORDING_STATUSES, DEFAULT_WRITING_STATUSES, type DocLine, type DocumentationClass, type EditRecord, type Effect, type EstimatingConfig, type Expression, type FlowFile, type FlowNode, type GameData, type GameDataField, type GameDataFieldType, type GameDataFields, type GameDataNodeKind, type GameEventBeat, type GrammaticalGender, type Group, type HostScopeDecl, type HostScopeRegistry, type HostScopeSpec, type Jump, type JumpTarget, type LineBeat, type LocaleFile, PROJECT_LOCALE_SCENE, type ProjectDictionary, type ProjectFile, type PromptBeat, type PropertyDecl, type PropertyType, RERECORD_STATUS, RERECORD_STATUS_DECL, RESERVED_PROPERTY_NAMES, type RecordingFolder, type RecordingStatusDecl, type ScalarValue, type Scene, type Selector, type SelectorExhaust, type SelectorOrder, type SequenceOptions, type Snippet, type Suggestion, type TextBeat, type VcsKind, type WritingStatusDecl, castStringKey, deriveRecordingFolders, effectiveGameId, gameIdify, isCaseOnlyPropertyName, isContentlessBeat, isValidGameId, isValidPropertyName, propertyNameify, walkNodes };
+export { type AuthoringFile, type Beat, type Block, type Bundle, type BundleCastMember, COMMON_GENDERS, type CaptionDelimiters, type CastMember, type Comment, type CommentMessage, type CommentRange, type CompiledBlock, type CompiledEffect, type CompiledGroup, type CompiledScene, type CompiledSnippet, type CoverageDriver, DEFAULT_CAPTION_CHARACTER, DEFAULT_CAPTION_DELIMITERS, DEFAULT_DOCUMENTATION_CLASSES, DEFAULT_RECORDING_STATUSES, DEFAULT_WRITING_STATUSES, type DocLine, type DocumentationClass, type EditRecord, type Effect, type EstimatingConfig, type Expression, type FlowFile, type FlowNode, type GameData, type GameDataField, type GameDataFieldType, type GameDataFields, type GameDataNodeKind, type GameEventBeat, type GrammaticalGender, type Group, type HostScopeDecl, type HostScopeRegistry, type HostScopeSpec, type Jump, type JumpTarget, type LineBeat, type LocaleFile, PROJECT_LOCALE_SCENE, type ProjectDictionary, type ProjectFile, type PromptBeat, type PropertyDecl, type PropertyType, RERECORD_STATUS, RERECORD_STATUS_DECL, type RecordingFolder, type RecordingStatusDecl, type ScalarValue, type Scene, type Selector, type SelectorExhaust, type SelectorOrder, type SequenceOptions, type Snippet, type Suggestion, type TextBeat, type VcsKind, type WritingStatusDecl, castStringKey, deriveRecordingFolders, effectiveGameId, gameIdify, isContentlessBeat, isValidGameId, walkNodes };

package/dist/index.js

@@ -1,4 +1,10 @@
 // src/index.ts
+import {
+  propertyNameify,
+  isValidPropertyName,
+  isCaseOnlyPropertyName,
+  RESERVED_PROPERTY_NAMES
+} from "@wildwinter/expr";
 function walkNodes(nodes, visit) {
   for (const node of nodes) {
     visit(node);
@@ -19,22 +25,6 @@ function gameIdify(text) {
 function isValidGameId(gameId) {
   return /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(gameId);
 }
-var RESERVED_PROPERTY_NAMES = ["true", "false", "and", "or", "not"];
-function propertyNameify(text) {
-  const trimmed = text.trim();
-  const deliberateLeading = trimmed.startsWith("_");
-  let out = trimmed.toLowerCase().replace(/['\u2019]/g, "").replace(/[^a-z0-9_]+/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
-  if (out === "") return "";
-  if (deliberateLeading || /^[0-9]/.test(out)) out = `_${out}`;
-  if (RESERVED_PROPERTY_NAMES.includes(out)) out = `${out}_`;
-  return out;
-}
-function isValidPropertyName(name) {
-  return /^[a-z_][a-z0-9_]*$/.test(name) && !RESERVED_PROPERTY_NAMES.includes(name);
-}
-function isCaseOnlyPropertyName(name) {
-  return !isValidPropertyName(name) && isValidPropertyName(name.toLowerCase());
-}
 function effectiveGameId(entity) {
   const g = entity.gameId?.trim();
   return g ? g : gameIdify(entity.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/model",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Patter data-model types: source (scene/block/group/snippet/beat/jump), project, locale, authoring. The shape source-of-truth.",
   "type": "module",
   "license": "MIT",
@@ -34,6 +34,6 @@
     "build": "tsup src/index.ts --format esm,cjs --dts --clean"
   },
   "dependencies": {
-    "@wildwinter/expr": "^0.4.0"
+    "@wildwinter/expr": "^0.5.0"
   }
 }