Fix @tomic/cli handling names as shortnames #1071

Author: Polleps

browser/CHANGELOG.md

@@ -40,7 +40,7 @@ This changelog covers all five packages, as they are (for now) updated as a whol
 
 - [#983](https://github.com/atomicdata-dev/atomic-server/issues/983) Give clear error when name collisions are found in an ontology.
 - Generates class definitions that enables doing: `resource.props.name = 'New Name'`;
-
+-
 ### @tomic/svelte
 
 - [#700](https://github.com/atomicdata-dev/atomic-server/issues/700) Update to Svelte 5. There are significant changes to the API.

browser/cli/src/generateBaseObject.ts

@@ -20,7 +20,7 @@ export const generateBaseObject = async (
 
   const classes = dedupe(ontology.props.classes ?? []);
   const properties = dedupe(ontology.props.properties ?? []);
-  const name = camelCaseify(ontology.title);
+  const name = camelCaseify(ontology.props.shortname);
 
   const baseObj = {
     classes: await listToObj(classes, 'classes'),
@@ -45,7 +45,7 @@ const listToObj = async (
     list.map(async subject => {
       const resource = await store.getResource(subject);
 
-      return [camelCaseify(resource.title), subject];
+      return [camelCaseify(resource.get(core.properties.shortname)), subject];
     }),
   );
 

browser/cli/src/generateClassExports.ts

@@ -1,4 +1,4 @@
-import { Resource, urls } from '@tomic/lib';
+import { Resource, urls, type Core } from '@tomic/lib';
 import { atomicConfig } from './config.js';
 import { ReverseMapping } from './generateBaseObject.js';
 import { store } from './store.js';
@@ -17,24 +17,24 @@ const NAMESPACE_TEMPLATE = `
 `;
 
 export const generateClassExports = (
-  ontology: Resource,
+  ontology: Resource<Core.Ontology>,
   reverseMapping: ReverseMapping,
 ): string => {
   const classes = ontology.getArray(urls.properties.classes) as string[];
 
   const body = classes
     .map(subject => {
-      const res = store.getResourceLoading(subject);
+      const res = store.getResourceLoading<Core.Class>(subject);
       const objectPath = reverseMapping[subject];
 
-      return createExportLine(res.title, objectPath);
+      return createExportLine(res.props.shortname, objectPath);
     })
     .join('\n');
 
   if (atomicConfig.useNamespaces) {
     return NAMESPACE_TEMPLATE.replace(
       Inserts.NamespaceName,
-      capitalize(ontology.title),
+      capitalize(ontology.props.shortname),
     ).replace(Inserts.NamespaceBody, body);
   } else {
     return body;

browser/cli/src/generateIndex.ts

@@ -1,6 +1,7 @@
 import { store } from './store.js';
 import { camelCaseify, getExtension } from './utils.js';
 import { atomicConfig } from './config.js';
+import type { Core } from '@tomic/lib';
 
 enum Inserts {
   MODULE_ALIAS = '{{1}}',
@@ -31,9 +32,9 @@ export const generateIndex = (
   inludeExternals: boolean,
 ) => {
   const names = ontologies.map(x => {
-    const res = store.getResourceLoading(x);
+    const res = store.getResourceLoading<Core.Ontology>(x);
 
-    return camelCaseify(res.title);
+    return camelCaseify(res.props.shortname);
   });
 
   if (inludeExternals) {

browser/cli/src/generateOntology.ts

@@ -72,7 +72,7 @@ export const generateOntology = async (
     .replace(Inserts.PROP_SUBJECT_TO_NAME_MAPPING, subToNameStr);
 
   return {
-    filename: `${camelCaseify(ontology.title)}.ts`,
+    filename: `${camelCaseify(ontology.props.shortname)}.ts`,
     content,
   };
 };

browser/cli/src/utils.ts

@@ -1,7 +1,7 @@
 import { getTsconfig } from 'get-tsconfig';
 
 export const camelCaseify = (str: string) =>
-  str.replace(/-([a-z])/g, g => {
+  str.replace(/-([a-z0-9])/g, g => {
     return g[1].toUpperCase();
   });