@atmyapp/cli 0.0.3 → 0.0.6

package/README.md

@@ -275,6 +275,21 @@ export type UserManual = AmaFileDef<"/docs/manual.pdf">;
 export type ATMYAPP = [HeroImage, UserManual];
 ```
 
+### Icon Definitions
+
+Define icons with `AmaIconDef` (simpler than images, no configuration needed):
+
+```typescript
+import { AmaIconDef } from "@atmyapp/core";
+
+// Icon definitions
+export type MenuIcon = AmaIconDef<"/icons/menu">;
+export type SearchIcon = AmaIconDef<"/icons/search">;
+export type UserIcon = AmaIconDef<"/icons/user">;
+
+export type ATMYAPP = [MenuIcon, SearchIcon, UserIcon];
+```
+
 ## 💡 Examples
 
 ### 🏪 E-commerce Setup
@@ -305,6 +320,11 @@ export type ProductImage = AmaImageDef<
   }
 >;
 
+// UI Icons
+export type CartIcon = AmaIconDef<"/icons/cart">;
+export type WishlistIcon = AmaIconDef<"/icons/wishlist">;
+export type CompareIcon = AmaIconDef<"/icons/compare">;
+
 // E-commerce events
 export type ProductViewEvent = AmaCustomEventDef<
   "product_view",
@@ -326,6 +346,9 @@ export type ATMYAPP = [
   ProductCatalog,
   FeaturedProduct,
   ProductImage,
+  CartIcon,
+  WishlistIcon,
+  CompareIcon,
   ProductViewEvent,
   AddToCartEvent,
   PurchaseEvent,
@@ -336,7 +359,12 @@ export type ATMYAPP = [
 
 ```typescript
 // types/blog.ts
-import { AmaContentDef, AmaCustomEventDef, AmaImageDef } from "@atmyapp/core";
+import {
+  AmaContentDef,
+  AmaCustomEventDef,
+  AmaImageDef,
+  AmaIconDef,
+} from "@atmyapp/core";
 
 // Blog content types
 interface BlogPost {
@@ -375,6 +403,11 @@ export type BlogHeroImage = AmaImageDef<
   }
 >;
 
+// Blog UI icons
+export type ShareIcon = AmaIconDef<"/icons/share">;
+export type LikeIcon = AmaIconDef<"/icons/like">;
+export type CommentIcon = AmaIconDef<"/icons/comment">;
+
 // Blog analytics events
 export type ArticleReadEvent = AmaCustomEventDef<
   "article_read",
@@ -396,6 +429,9 @@ export type ATMYAPP = [
   FeaturedPost,
   Categories,
   BlogHeroImage,
+  ShareIcon,
+  LikeIcon,
+  CommentIcon,
   ArticleReadEvent,
   CommentEvent,
   ShareEvent,
@@ -462,7 +498,8 @@ your-project/
 ├── types/
 │   ├── content.ts         # Content definitions
 │   ├── events.ts          # Event definitions
-│   └── media.ts           # Image/file definitions
+│   ├── media.ts           # Image/file definitions
+│   └── icons.ts           # Icon definitions
 ├── .gitignore             # Updated automatically
 └── tsconfig.json          # TypeScript config
 ```
@@ -520,7 +557,7 @@ uploadDefinitions(output)
 ### Built-in Processors
 
 - **pathNormalizer** - Normalizes file paths across platforms
-- **typeDetector** - Detects content, event, image, and file types
+- **typeDetector** - Detects content, event, image, file, and icon types
 - **duplicateValidator** - Prevents duplicate path definitions
 - **metadataEnricher** - Adds processing metadata to output
 
@@ -585,35 +622,17 @@ tests/
 ### Example Test
 
 ```typescript
-describe("Event Processing", () => {
-  it("should separate events from regular definitions", () => {
+describe("Icon Processing", () => {
+  it("should detect and process icon definitions", () => {
     const contents: Content[] = [
       {
-        path: "hero.json",
-        structure: { title: "Hero" },
-      },
-      {
-        path: "page_view_event",
-        structure: {
-          type: "event",
-          properties: {
-            id: { const: "page_view" },
-            columns: { const: ["page", "user_id", "timestamp"] },
-            type: { const: "event" },
-          },
-        },
+        path: "/icons/menu",
+        structure: { __amatype: "AmaIconDef" },
       },
     ];
 
-    const output = generateOutput(contents, {}, mockLogger);
-
-    expect(output.definitions["hero.json"]).toBeDefined();
-    expect(output.events["page_view"]).toBeDefined();
-    expect(output.events["page_view"]).toHaveProperty("columns", [
-      "page",
-      "user_id",
-      "timestamp",
-    ]);
+    const contentType = determineContentType(contents[0]);
+    expect(contentType).toBe("icon");
   });
 });
 ```
@@ -625,13 +644,13 @@ describe("Event Processing", () => {
 ✅ **Do:**
 
 - Group related definitions in separate files
-- Use descriptive type names
+- Use descriptive type names for icons (e.g., `MenuIcon`, `SearchIcon`)
 - Keep event column order consistent
 - Include comprehensive type documentation
 
 ❌ **Don't:**
 
-- Mix content and event definitions unnecessarily
+- Mix content, event, and media definitions unnecessarily
 - Use dynamic or computed type names
 - Ignore TypeScript compiler errors
 

package/dist/cli/utils/content-processor.js

@@ -15,21 +15,28 @@ function initializePipeline() {
 }
 // Determines the content type based on its structure and path
 function determineContentType(content) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     // Extract file extension
     const fileExt = (_a = content.path.split(".").pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-    // Check for event types
+    // Check for event types - support both custom events and basic events
     if (((_b = content.structure) === null || _b === void 0 ? void 0 : _b.type) === "event" ||
-        ((_e = (_d = (_c = content.structure) === null || _c === void 0 ? void 0 : _c.properties) === null || _d === void 0 ? void 0 : _d.type) === null || _e === void 0 ? void 0 : _e.const) === "event" ||
-        ((_f = content.structure) === null || _f === void 0 ? void 0 : _f.__amatype) === "AmaCustomEventDef") {
+        ((_c = content.structure) === null || _c === void 0 ? void 0 : _c.type) === "basic_event" ||
+        ((_f = (_e = (_d = content.structure) === null || _d === void 0 ? void 0 : _d.properties) === null || _e === void 0 ? void 0 : _e.type) === null || _f === void 0 ? void 0 : _f.const) === "event" ||
+        ((_j = (_h = (_g = content.structure) === null || _g === void 0 ? void 0 : _g.properties) === null || _h === void 0 ? void 0 : _h.type) === null || _j === void 0 ? void 0 : _j.const) === "basic_event" ||
+        ((_k = content.structure) === null || _k === void 0 ? void 0 : _k.__amatype) === "AmaCustomEventDef" ||
+        ((_l = content.structure) === null || _l === void 0 ? void 0 : _l.__amatype) === "AmaEventDef") {
         return "event";
     }
+    // Check for icon types based on structure
+    if (((_m = content.structure) === null || _m === void 0 ? void 0 : _m.__amatype) === "AmaIconDef") {
+        return "icon";
+    }
     // Check for image types based on structure or extension
-    if (((_g = content.structure) === null || _g === void 0 ? void 0 : _g.__amatype) === "AmaImageDef") {
+    if (((_o = content.structure) === null || _o === void 0 ? void 0 : _o.__amatype) === "AmaImageDef") {
         return "image";
     }
     // Check for file types
-    if (((_h = content.structure) === null || _h === void 0 ? void 0 : _h.__amatype) === "AmaFileDef") {
+    if (((_p = content.structure) === null || _p === void 0 ? void 0 : _p.__amatype) === "AmaFileDef") {
         return "file";
     }
     // Default type for other content
@@ -59,7 +66,9 @@ function extractEventConfig(content) {
         else if ((_m = content.structure) === null || _m === void 0 ? void 0 : _m.id) {
             eventId = content.structure.id;
         }
-        if (columns.length > 0) {
+        // For basic events, columns might be empty (they use Record<string, string>)
+        // So we allow empty columns array for basic events
+        if (eventId) {
             return { columns };
         }
     }

package/dist/cli/utils/definition-processor.js

@@ -133,7 +133,7 @@ exports.builtInProcessors = {
     typeDetector: {
         name: "type-detector",
         process: (content, context) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { logger } = context;
             // Extract file extension
             const fileExt = (_a = content.path.split(".").pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
@@ -143,10 +143,13 @@ exports.builtInProcessors = {
                 ((_f = content.structure) === null || _f === void 0 ? void 0 : _f.__amatype) === "AmaCustomEventDef") {
                 content.type = "event";
             }
-            else if (((_g = content.structure) === null || _g === void 0 ? void 0 : _g.__amatype) === "AmaImageDef") {
+            else if (((_g = content.structure) === null || _g === void 0 ? void 0 : _g.__amatype) === "AmaIconDef") {
+                content.type = "icon";
+            }
+            else if (((_h = content.structure) === null || _h === void 0 ? void 0 : _h.__amatype) === "AmaImageDef") {
                 content.type = "image";
             }
-            else if (((_h = content.structure) === null || _h === void 0 ? void 0 : _h.__amatype) === "AmaFileDef") {
+            else if (((_j = content.structure) === null || _j === void 0 ? void 0 : _j.__amatype) === "AmaFileDef") {
                 content.type = "file";
             }
             else if (["jpg", "jpeg", "png", "gif", "svg", "webp"].includes(fileExt || "")) {

package/dist/cli/utils/schema-processor.js

@@ -138,39 +138,58 @@ function extractEventInfoFromAST(file, definitionType, logger) {
             logger.verbose_log(`Type alias ${definitionType} has no type node`);
             return null;
         }
-        // Check if this is a type reference (like AmaCustomEventDef<...>)
+        // Check if this is a type reference (like AmaCustomEventDef<...> or AmaEventDef<...>)
         if (ts_morph_1.Node.isTypeReference(typeNode)) {
             const typeName = typeNode.getTypeName();
             const typeArguments = typeNode.getTypeArguments();
-            // Check if this is AmaCustomEventDef
-            if (ts_morph_1.Node.isIdentifier(typeName) &&
-                typeName.getText() === "AmaCustomEventDef") {
-                if (typeArguments.length >= 2) {
-                    // First argument should be the event ID (string literal)
-                    const idArg = typeArguments[0];
-                    let eventId = null;
-                    if (ts_morph_1.Node.isLiteralTypeNode(idArg)) {
-                        const literal = idArg.getLiteral();
-                        if (ts_morph_1.Node.isStringLiteral(literal)) {
-                            eventId = literal.getLiteralValue();
+            // Check if this is AmaCustomEventDef or AmaEventDef
+            if (ts_morph_1.Node.isIdentifier(typeName)) {
+                const typeNameText = typeName.getText();
+                if (typeNameText === "AmaCustomEventDef") {
+                    if (typeArguments.length >= 2) {
+                        // First argument should be the event ID (string literal)
+                        const idArg = typeArguments[0];
+                        let eventId = null;
+                        if (ts_morph_1.Node.isLiteralTypeNode(idArg)) {
+                            const literal = idArg.getLiteral();
+                            if (ts_morph_1.Node.isStringLiteral(literal)) {
+                                eventId = literal.getLiteralValue();
+                            }
                         }
-                    }
-                    // Second argument should be the columns (tuple of string literals)
-                    const columnsArg = typeArguments[1];
-                    let columns = [];
-                    if (ts_morph_1.Node.isTupleTypeNode(columnsArg)) {
-                        columnsArg.getElements().forEach((element) => {
-                            if (ts_morph_1.Node.isLiteralTypeNode(element)) {
-                                const literal = element.getLiteral();
-                                if (ts_morph_1.Node.isStringLiteral(literal)) {
-                                    columns.push(literal.getLiteralValue());
+                        // Second argument should be the columns (tuple of string literals)
+                        const columnsArg = typeArguments[1];
+                        let columns = [];
+                        if (ts_morph_1.Node.isTupleTypeNode(columnsArg)) {
+                            columnsArg.getElements().forEach((element) => {
+                                if (ts_morph_1.Node.isLiteralTypeNode(element)) {
+                                    const literal = element.getLiteral();
+                                    if (ts_morph_1.Node.isStringLiteral(literal)) {
+                                        columns.push(literal.getLiteralValue());
+                                    }
                                 }
-                            }
-                        });
+                            });
+                        }
+                        if (eventId && columns.length > 0) {
+                            logger.verbose_log(`AST extraction successful for ${definitionType}: id=${eventId}, columns=[${columns.join(", ")}]`);
+                            return { id: eventId, columns };
+                        }
                     }
-                    if (eventId && columns.length > 0) {
-                        logger.verbose_log(`AST extraction successful for ${definitionType}: id=${eventId}, columns=[${columns.join(", ")}]`);
-                        return { id: eventId, columns };
+                }
+                else if (typeNameText === "AmaEventDef") {
+                    // Handle AmaEventDef (basic events) - only has ID argument
+                    if (typeArguments.length >= 1) {
+                        const idArg = typeArguments[0];
+                        let eventId = null;
+                        if (ts_morph_1.Node.isLiteralTypeNode(idArg)) {
+                            const literal = idArg.getLiteral();
+                            if (ts_morph_1.Node.isStringLiteral(literal)) {
+                                eventId = literal.getLiteralValue();
+                            }
+                        }
+                        if (eventId) {
+                            logger.verbose_log(`AST extraction successful for basic event ${definitionType}: id=${eventId}`);
+                            return { id: eventId, columns: [] }; // Basic events have no predefined columns
+                        }
                     }
                 }
             }
@@ -185,7 +204,7 @@ function extractEventInfoFromAST(file, definitionType, logger) {
 }
 // Processes an ATMYAPP export to extract content definitions
 function processAtmyappExport(atmyappType, file, tsconfigPath, logger) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const contents = [];
     logger.verbose_log(`Processing ATMYAPP export in ${file.getFilePath()}`);
     // Extract individual definition types from the array
@@ -252,43 +271,45 @@ function processAtmyappExport(atmyappType, file, tsconfigPath, logger) {
             logger.verbose_log(`Schema for ${definitionType}: ${JSON.stringify(properties, null, 2)}`);
             // Check if this is an event definition
             const isEventDef = ((_a = properties.type) === null || _a === void 0 ? void 0 : _a.const) === "event" ||
-                (((_b = properties.__is_ATMYAPP_Object) === null || _b === void 0 ? void 0 : _b.const) === true &&
+                ((_b = properties.type) === null || _b === void 0 ? void 0 : _b.const) === "basic_event" ||
+                (((_c = properties.__is_ATMYAPP_Object) === null || _c === void 0 ? void 0 : _c.const) === true &&
                     properties.id &&
-                    properties.columns);
+                    (properties.columns || ((_d = properties.type) === null || _d === void 0 ? void 0 : _d.const) === "basic_event"));
             if (isEventDef) {
-                // Handle AmaCustomEventDef - use id as path and extract event structure
+                // Handle AmaCustomEventDef and AmaEventDef - use id as path and extract event structure
                 let eventId = null;
                 let columns = [];
                 // Extract event ID - try different possible structures
-                if ((_c = properties.id) === null || _c === void 0 ? void 0 : _c.const) {
+                if ((_e = properties.id) === null || _e === void 0 ? void 0 : _e.const) {
                     eventId = properties.id.const;
                 }
-                else if (((_d = properties.id) === null || _d === void 0 ? void 0 : _d.enum) && properties.id.enum.length === 1) {
+                else if (((_f = properties.id) === null || _f === void 0 ? void 0 : _f.enum) && properties.id.enum.length === 1) {
                     eventId = properties.id.enum[0];
                 }
-                else if (((_e = properties.id) === null || _e === void 0 ? void 0 : _e.type) === "string" && ((_f = properties.id) === null || _f === void 0 ? void 0 : _f.title)) {
+                else if (((_g = properties.id) === null || _g === void 0 ? void 0 : _g.type) === "string" && ((_h = properties.id) === null || _h === void 0 ? void 0 : _h.title)) {
                     // Fallback: try to extract from title or other metadata
                     eventId = properties.id.title;
                 }
                 // Extract columns - try different possible structures
-                if ((_g = properties.columns) === null || _g === void 0 ? void 0 : _g.const) {
+                // For basic events, columns might not exist (they use Record<string, string>)
+                if ((_j = properties.columns) === null || _j === void 0 ? void 0 : _j.const) {
                     columns = properties.columns.const;
                 }
-                else if ((_j = (_h = properties.columns) === null || _h === void 0 ? void 0 : _h.items) === null || _j === void 0 ? void 0 : _j.const) {
+                else if ((_l = (_k = properties.columns) === null || _k === void 0 ? void 0 : _k.items) === null || _l === void 0 ? void 0 : _l.const) {
                     columns = properties.columns.items.const;
                 }
-                else if (((_k = properties.columns) === null || _k === void 0 ? void 0 : _k.items) &&
+                else if (((_m = properties.columns) === null || _m === void 0 ? void 0 : _m.items) &&
                     Array.isArray(properties.columns.items)) {
                     // Handle array of const items - extract const value from each item
                     columns = properties.columns.items
                         .map((item) => item.const)
                         .filter(Boolean);
                 }
-                else if ((_m = (_l = properties.columns) === null || _l === void 0 ? void 0 : _l.items) === null || _m === void 0 ? void 0 : _m.enum) {
+                else if ((_p = (_o = properties.columns) === null || _o === void 0 ? void 0 : _o.items) === null || _p === void 0 ? void 0 : _p.enum) {
                     // Handle tuple type where each position has enum with single value
                     columns = properties.columns.items.enum;
                 }
-                else if (((_o = properties.columns) === null || _o === void 0 ? void 0 : _o.enum) &&
+                else if (((_q = properties.columns) === null || _q === void 0 ? void 0 : _q.enum) &&
                     Array.isArray(properties.columns.enum[0])) {
                     // Handle case where columns is an enum with array values
                     columns = properties.columns.enum[0];
@@ -299,20 +320,22 @@ function processAtmyappExport(atmyappType, file, tsconfigPath, logger) {
                     logger.warn(`Could not extract event ID from ${definitionType}`);
                     continue;
                 }
-                if (columns.length === 0) {
+                // For basic events, empty columns array is acceptable
+                const isBasicEvent = ((_r = properties.type) === null || _r === void 0 ? void 0 : _r.const) === "basic_event";
+                if (columns.length === 0 && !isBasicEvent) {
                     logger.warn(`Could not extract columns from ${definitionType}`);
                     continue;
                 }
-                logger.verbose_log(`Successfully extracted event: ${eventId} with columns: ${columns.join(", ")}`);
+                logger.verbose_log(`Successfully extracted ${isBasicEvent ? "basic " : ""}event: ${eventId}${columns.length > 0 ? ` with columns: ${columns.join(", ")}` : ""}`);
                 // Create event content with special structure
                 contents.push({
                     path: eventId, // Use event ID as path
                     structure: {
-                        type: "event",
+                        type: isBasicEvent ? "basic_event" : "event",
                         properties: {
                             id: { const: eventId },
                             columns: { const: columns },
-                            type: { const: "event" },
+                            type: { const: isBasicEvent ? "basic_event" : "event" },
                         },
                     },
                 });
@@ -322,10 +345,10 @@ function processAtmyappExport(atmyappType, file, tsconfigPath, logger) {
                 let path = null;
                 let structure = null;
                 // Look for path in different possible locations
-                if ((_p = properties.path) === null || _p === void 0 ? void 0 : _p.const) {
+                if ((_s = properties.path) === null || _s === void 0 ? void 0 : _s.const) {
                     path = properties.path.const;
                 }
-                else if ((_q = properties._path) === null || _q === void 0 ? void 0 : _q.const) {
+                else if ((_t = properties._path) === null || _t === void 0 ? void 0 : _t.const) {
                     path = properties._path.const;
                 }
                 // Look for structure/data in different possible locations

package/dist/cli/utils/worker-file-processor.js

@@ -94,7 +94,7 @@ function processFileInWorker(filePath, tsconfigPath) {
 // Optimized version that reuses TypeScript programs
 function processAtmyappExportOptimized(atmyappType, file, tsconfigPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const contents = [];
         const filePath = file.getFilePath();
         // Extract definition types
@@ -146,9 +146,10 @@ function processAtmyappExportOptimized(atmyappType, file, tsconfigPath) {
             }
             const properties = result.schema.properties;
             const isEventDef = ((_a = properties.type) === null || _a === void 0 ? void 0 : _a.const) === "event" ||
-                (((_b = properties.__is_ATMYAPP_Object) === null || _b === void 0 ? void 0 : _b.const) === true &&
+                ((_b = properties.type) === null || _b === void 0 ? void 0 : _b.const) === "basic_event" ||
+                (((_c = properties.__is_ATMYAPP_Object) === null || _c === void 0 ? void 0 : _c.const) === true &&
                     properties.id &&
-                    properties.columns);
+                    (properties.columns || ((_d = properties.type) === null || _d === void 0 ? void 0 : _d.const) === "basic_event"));
             if (isEventDef) {
                 // Handle event definitions
                 const eventContent = processEventDefinition(properties, result.definitionType);
@@ -184,14 +185,14 @@ function extractDefinitionTypes(atmyappType) {
     return elementTypes;
 }
 function processEventDefinition(properties, definitionType) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     let eventId = null;
     let columns = [];
     // Extract event ID
     if ((_a = properties.id) === null || _a === void 0 ? void 0 : _a.const) {
         eventId = properties.id.const;
     }
-    // Extract columns
+    // Extract columns (may be empty for basic events)
     if ((_b = properties.columns) === null || _b === void 0 ? void 0 : _b.const) {
         columns = properties.columns.const;
     }
@@ -204,17 +205,24 @@ function processEventDefinition(properties, definitionType) {
             .map((item) => item.const)
             .filter(Boolean);
     }
-    if (!eventId || columns.length === 0) {
+    // Check if this is a basic event
+    const isBasicEvent = ((_f = properties.type) === null || _f === void 0 ? void 0 : _f.const) === "basic_event";
+    // For basic events, we don't require columns, but we still need an event ID
+    if (!eventId) {
+        return null;
+    }
+    // For custom events, we require columns, but for basic events columns can be empty
+    if (!isBasicEvent && columns.length === 0) {
         return null;
     }
     return {
         path: eventId,
         structure: {
-            type: "event",
+            type: isBasicEvent ? "basic_event" : "event",
             properties: {
                 id: { const: eventId },
                 columns: { const: columns },
-                type: { const: "event" },
+                type: { const: isBasicEvent ? "basic_event" : "event" },
             },
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atmyapp/cli",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -28,7 +28,7 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
-    "@atmyapp/core": "^0.0.3",
+    "@atmyapp/core": "^0.0.6",
     "@types/jest": "^29.5.14",
     "@typescript-eslint/eslint-plugin": "^8.32.1",
     "@typescript-eslint/parser": "^8.32.1",