@garrix82/reactgenie-dsl 1.0.1 → 1.0.3

package/dist/decorators/decorators.js

@@ -13,6 +13,23 @@ let genieInitialized = false;
 function hasOwn(target, key) {
     return Object.prototype.hasOwnProperty.call(target, key);
 }
+function getStableClassName(target) {
+    const descriptorClassName = target?.ClassDescriptor?.className;
+    if (typeof descriptorClassName === "string" && descriptorClassName.length > 0) {
+        return descriptorClassName;
+    }
+    const explicitClassName = target?.displayName ??
+        target?.__genieClassName ??
+        target?.prototype?.displayName ??
+        target?.prototype?.__genieClassName;
+    if (typeof explicitClassName === "string" && explicitClassName.length > 0) {
+        return explicitClassName;
+    }
+    if (typeof target?.name === "string" && target.name.length > 0) {
+        return target.name;
+    }
+    throw new Error("Unable to determine stable Genie class name.");
+}
 function uniqueFuncDescriptors(descriptors) {
     const unique = [];
     descriptors.forEach((descriptor) => {
@@ -144,7 +161,7 @@ const serializeField = (generateGetterSetter) => (value, path = []) => {
         value.constructor.__genieObjectType == "DataClass") {
         return {
             __genieObjectType: "DataClass",
-            __genieObjectClass: value.constructor.name,
+            __genieObjectClass: getStableClassName(value.constructor),
             __genieObjectKey: value[value.genieKey],
         };
     }
@@ -158,7 +175,7 @@ const serializeField = (generateGetterSetter) => (value, path = []) => {
                 "Please make sure to use CreateObject() to create HelperClass instance.");
         }
         serializedValue["__genieObjectType"] = "HelperClass";
-        serializedValue["__genieObjectClass"] = value.constructor.name;
+        serializedValue["__genieObjectClass"] = getStableClassName(value.constructor);
         return serializedValue;
     }
     return value;
@@ -185,6 +202,19 @@ const deserializeField = (generateGetterSetter) => (value, path = []) => {
 function GenieClass(comment = "") {
     return function (target) {
         target.prototype.comment = comment;
+        const stableClassName = typeof target.displayName === "string" && target.displayName.length > 0
+            ? target.displayName
+            : typeof target.__genieClassName === "string" && target.__genieClassName.length > 0
+                ? target.__genieClassName
+                : target.name;
+        if (typeof stableClassName === "string" && stableClassName.length > 0) {
+            target.displayName = stableClassName;
+            target.__genieClassName = stableClassName;
+            if (target.prototype) {
+                target.prototype.displayName = stableClassName;
+                target.prototype.__genieClassName = stableClassName;
+            }
+        }
         if (!hasOwn(target, "ClassDescriptor")) {
             const inheritedClass = Object.getPrototypeOf(target);
             const inheritedDescriptor = inheritedClass?.ClassDescriptor;
@@ -200,23 +230,24 @@ function GenieClass(comment = "") {
             const ownFields = hasOwn(target, "__class_descriptor_properties")
                 ? target.__class_descriptor_properties
                 : [];
-            target.ClassDescriptor = new dsl_descriptor_1.ClassDescriptor(target.name, uniqueFuncDescriptors([...inheritedFunctions, ...ownFunctions]), uniqueFieldDescriptors([...inheritedFields, ...ownFields]), target, comment);
+            target.ClassDescriptor = new dsl_descriptor_1.ClassDescriptor(getStableClassName(target), uniqueFuncDescriptors([...inheritedFunctions, ...ownFunctions]), uniqueFieldDescriptors([...inheritedFields, ...ownFields]), target, comment);
         }
+        const targetClassName = getStableClassName(target);
         if (target.prototype instanceof dsl_descriptor_1.DataClass) {
             target._createObject = function (...args) {
                 const obj = new target(...args);
                 const generateGetterSetter = function (path) {
                     return [
-                        () => getJsonByPath(store_1.sharedState["OBJECT"][target.name][obj[keyField]], path),
+                        () => getJsonByPath(store_1.sharedState["OBJECT"][targetClassName][obj[keyField]], path),
                         (value) => {
                             (0, store_1.genieDispatch)(() => {
                                 (0, store_1.setSharedState)({
                                     ...store_1.sharedState,
                                     ["OBJECT"]: {
                                         ...store_1.sharedState["OBJECT"],
-                                        [target.name]: {
-                                            ...store_1.sharedState["OBJECT"][target.name],
-                                            [obj[keyField]]: setJsonByPath(store_1.sharedState["OBJECT"][target.name][obj[keyField]], path, value),
+                                        [targetClassName]: {
+                                            ...store_1.sharedState["OBJECT"][targetClassName],
+                                            [obj[keyField]]: setJsonByPath(store_1.sharedState["OBJECT"][targetClassName][obj[keyField]], path, value),
                                         },
                                     }
                                 });
@@ -230,7 +261,7 @@ function GenieClass(comment = "") {
                 });
                 let keyField = obj.genieKey;
                 if (allFields.indexOf(keyField) === -1) {
-                    throw new Error("keyField " + keyField + " not found in class " + target.name);
+                    throw new Error("keyField " + keyField + " not found in class " + targetClassName);
                 }
                 if (obj[keyField] === null || obj[keyField] === undefined) {
                     throw new Error("keyField " +
@@ -243,9 +274,9 @@ function GenieClass(comment = "") {
                 }
                 (0, store_1.genieDispatch)(() => {
                     let objectState = {};
-                    if (store_1.sharedState["OBJECT"][target.name]) {
+                    if (store_1.sharedState["OBJECT"][targetClassName]) {
                         objectState = {
-                            ...store_1.sharedState["OBJECT"][target.name],
+                            ...store_1.sharedState["OBJECT"][targetClassName],
                         };
                     }
                     objectState[obj[keyField]] = {};
@@ -256,7 +287,7 @@ function GenieClass(comment = "") {
                         ...store_1.sharedState,
                         ["OBJECT"]: {
                             ...store_1.sharedState["OBJECT"],
-                            [target.name]: objectState,
+                            [targetClassName]: objectState,
                         }
                     });
                 });
@@ -266,7 +297,7 @@ function GenieClass(comment = "") {
                     }
                     Object.defineProperty(obj, field, {
                         get: function () {
-                            let value = store_1.sharedState["OBJECT"][target.name][obj[keyField]][field];
+                            let value = store_1.sharedState["OBJECT"][targetClassName][obj[keyField]][field];
                             return deserializeField(generateGetterSetter)(value, [field]);
                         },
                         set: function (value) {
@@ -275,10 +306,10 @@ function GenieClass(comment = "") {
                                     ...store_1.sharedState,
                                     ["OBJECT"]: {
                                         ...store_1.sharedState["OBJECT"],
-                                        [target.name]: {
-                                            ...store_1.sharedState["OBJECT"][target.name],
+                                        [targetClassName]: {
+                                            ...store_1.sharedState["OBJECT"][targetClassName],
                                             [obj[keyField]]: {
-                                                ...store_1.sharedState["OBJECT"][target.name][obj[keyField]],
+                                                ...store_1.sharedState["OBJECT"][targetClassName][obj[keyField]],
                                                 [field]: serializeField(generateGetterSetter)(value, [
                                                     field,
                                                 ]),
@@ -290,20 +321,20 @@ function GenieClass(comment = "") {
                         },
                     });
                 });
-                if (!store_1.objects[target.name]) {
-                    store_1.objects[target.name] = {};
+                if (!store_1.objects[targetClassName]) {
+                    store_1.objects[targetClassName] = {};
                 }
-                store_1.objects[target.name][obj[keyField]] = obj;
+                store_1.objects[targetClassName][obj[keyField]] = obj;
                 obj.__getState = function () {
                     return {
-                        "object": store_1.sharedState["OBJECT"][target.name][obj[keyField]],
-                        "class": store_1.sharedState["CLASS"][target.name]
+                        "object": store_1.sharedState["OBJECT"][targetClassName][obj[keyField]],
+                        "class": store_1.sharedState["CLASS"][targetClassName]
                     };
                 };
                 return obj;
             };
             target.GetObject = function (key) {
-                const classObjects = store_1.objects[target.name];
+                const classObjects = store_1.objects[targetClassName];
                 if (!classObjects) {
                     return undefined;
                 }
@@ -311,7 +342,7 @@ function GenieClass(comment = "") {
             };
             target.DeleteObject = function (key) {
                 (0, store_1.genieDispatch)(() => {
-                    const classObjects = store_1.objects[target.name];
+                    const classObjects = store_1.objects[targetClassName];
                     if (!classObjects) {
                         return undefined;
                     }
@@ -387,7 +418,7 @@ function GenieClass(comment = "") {
         if (target.prototype instanceof dsl_descriptor_1.DataClass) {
             function All() {
                 let allObjects = [];
-                const classObjects = store_1.objects[target.name];
+                const classObjects = store_1.objects[targetClassName];
                 if (!classObjects) {
                     return allObjects;
                 }
@@ -407,7 +438,7 @@ function GenieClass(comment = "") {
         if (genieClassModifier) {
             genieClassModifier(target);
         }
-        exports.AllGenieObjects[target.name] = target;
+        exports.AllGenieObjects[targetClassName] = target;
         if (genieInitialized) {
             target.setup();
         }
@@ -443,8 +474,8 @@ function classToName(object) {
     else if (object === Boolean) {
         return "bool";
     }
-    else if (object.hasOwnProperty("name")) {
-        return object.name;
+    else if (object && hasOwn(object, "name")) {
+        return getStableClassName(object);
     }
     throw new Error("classToName not implemented for " + object);
 }

package/dist/decorators/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../lib/decorators/decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../lib/decorators/decorators.ts"],"names":[],"mappings":"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"}

package/dist/nl/nl-parser-utils.js

@@ -183,6 +183,9 @@ function buildFallbackAgentResponse(parsedDsl, resultContext) {
 }
 exports.buildFallbackAgentResponse = buildFallbackAgentResponse;
 function buildCommandRepairMessages(userUtterance, invalidCommand, validationError, lastUsedPrompt) {
+    const safetyRules = "Do not use bare undefined, null, or placeholder identifiers as parameter values.\n" +
+        "Every named parameter must have a concrete string, number, boolean, accessor, or valid DSL expression value.\n" +
+        "Omit optional parameters instead of emitting undefined.";
     return [
         {
             role: "user",
@@ -197,13 +200,17 @@ function buildCommandRepairMessages(userUtterance, invalidCommand, validationErr
             content: "The previous DSL command is invalid.\n" +
                 `validation_error: ${validationError}\n` +
                 "Rewrite only the DSL command so it satisfies the original user utterance.\n" +
-                "Keep the original intent. Do not explain anything.",
+                "Keep the original intent. Do not explain anything.\n" +
+                safetyRules,
         },
     ];
 }
 exports.buildCommandRepairMessages = buildCommandRepairMessages;
 function buildCommandRepairInputText(userUtterance, invalidCommand, validationError) {
-    return ("The previous DSL command is invalid.\n" +
+    return ("Do not use bare undefined, null, or placeholder identifiers as parameter values.\n" +
+        "Every named parameter must have a concrete string, number, boolean, accessor, or valid DSL expression value.\n" +
+        "Omit optional parameters instead of emitting undefined.\n" +
+        "The previous DSL command is invalid.\n" +
         `original_user_utterance: ${userUtterance}\n` +
         `invalid_command: ${invalidCommand}\n` +
         `validation_error: ${validationError}\n` +

package/dist/nl/nl-parser-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"nl-parser-utils.js","sourceRoot":"","sources":["../../lib/nl/nl-parser-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nl-parser-utils.js","sourceRoot":"","sources":["../../lib/nl/nl-parser-utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@garrix82/reactgenie-dsl",
-    "version": "1.0.1",
+  "version": "1.0.3",
     "description": "A natural language parser based on a large language model",
     "scripts": {
         "prepare": "pnpm peggy lib/dsl/parser.pegjs -o lib/dsl/parser.gen.js && pnpm tsc",
@@ -25,7 +25,7 @@
         "@reduxjs/toolkit": "^1.9.7",
         "@types/jest": "^29.5.14",
         "babel-plugin-parameter-decorator": "^1.0.16",
-        "babel-plugin-reactgenie": "0.3.8",
+        "@garrix82/babel-plugin-reactgenie": "^0.3.9",
         "dotenv": "^16.6.1",
         "jest": "^29.7.0",
         "langsmith": "^0.3.71",
@@ -37,10 +37,6 @@
         "typescript": "~5.3.3"
     },
     "main": "dist/index.js",
-    "files": [
-        "lib/**",
-        "dist/**"
-    ],
     "directories": {
         "doc": "docs",
         "lib": "lib",

package/dist/__test__/dsl-descriptor.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/__test__/dsl-descriptor.test.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const example_descriptor_1 = require("./example_descriptor");
-test("Restaurant Description", async () => {
-    const description = example_descriptor_1.Restaurant._ClassDescriptor.description();
-    expect(description).toEqual("// A restaurant\n" +
-        "class Restaurant {\n" +
-        "\tstring name;\n" +
-        "\tFood[] menu;\n" +
-        "\tint rating;\n" +
-        "\tfloat priceGrade;\n" +
-        "\tstring cuisine;\n" +
-        "\tstring address;\n" +
-        "\tOrder[] orders;\n" +
-        "\t// All active restaurants\n" +
-        "\tstatic Restaurant[] all();\n" +
-        "\t// All active restaurants\n" +
-        "\tstatic Restaurant[] All();\n" +
-        "\t// The current restaurant\n" +
-        "\tstatic Restaurant current();\n" +
-        "\t// Book a table for a given date time\n" +
-        "\tvoid book(dateTime: DateTime? = `DateTime.today()`);\n" +
-        "\t// Book numbers tables for a given date time\n" +
-        "\tvoid bookTable(dateTime: DateTime?, number: int?);\n" +
-        "}");
-});
-//# sourceMappingURL=dsl-descriptor.test.js.map

package/dist/__test__/dsl-descriptor.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dsl-descriptor.test.js","sourceRoot":"","sources":["../../lib/__test__/dsl-descriptor.test.ts"],"names":[],"mappings":";;AAAA,6DAAkD;AAElD,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,WAAW,GAAG,+BAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAC9D,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CACzB,mBAAmB;QACnB,sBAAsB;QACpB,kBAAkB;QAClB,kBAAkB;QAClB,iBAAiB;QACjB,uBAAuB;QACvB,qBAAqB;QACrB,qBAAqB;QACrB,qBAAqB;QACrB,+BAA+B;QAC/B,gCAAgC;QAChC,+BAA+B;QAC/B,gCAAgC;QAChC,+BAA+B;QAC/B,kCAAkC;QAClC,2CAA2C;QAC3C,0DAA0D;QAC1D,kDAAkD;QAClD,wDAAwD;QACxD,GAAG,CACN,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/__test__/example_descriptor.d.ts

@@ -1,125 +0,0 @@
-import { ClassDescriptor, DataClass, HelperClass } from "../dsl-descriptor";
-import { ExampleParse } from "../nl";
-import { float, int, LazyType } from "../decorators";
-export declare let recentBooking: any;
-export declare class DateTime extends HelperClass {
-    private _date;
-    year: number;
-    month: number;
-    day: number;
-    dayOfWeek: string;
-    hour: number;
-    minute: number;
-    private updateDate;
-    static today(): DateTime;
-    static sunday: number;
-    static monday: number;
-    static tuesday: number;
-    static wednesday: number;
-    static thursday: number;
-    static friday: number;
-    static saturday: number;
-    static fromDate(date: Date): DateTime;
-    description(): {};
-    static compare(a: DateTime, b: DateTime): number;
-    constructor({ year, month, day, hour, minute, }: {
-        year?: number;
-        month?: number;
-        day?: number;
-        hour?: number;
-        minute?: number;
-    });
-    _getConstructorParams(): any;
-    addDateOffset({ year, month, day, hour, minute, }: {
-        year: number;
-        month: number;
-        day: number;
-        hour: number;
-        minute: number;
-    }): this;
-    setDate({ year, month, day, hour, minute, day_of_the_week, }: {
-        year?: number;
-        month?: number;
-        day?: number;
-        hour?: number;
-        minute?: number;
-        day_of_the_week?: number;
-    }): this;
-    toString(): string;
-    static _ClassDescriptor: ClassDescriptor<DateTime>;
-}
-export declare class Food extends DataClass {
-    static _all: Food[];
-    static all(): Food[];
-    _price: float;
-    name: string;
-    price: float;
-    restaurant: LazyType<Restaurant>;
-    constructor({ name, price, restaurant, }: {
-        name: string;
-        price: float;
-        restaurant: LazyType<Restaurant>;
-    });
-    update(): Promise<void>;
-    description(): {};
-    static _ClassDescriptor: ClassDescriptor<Food>;
-}
-export declare class Order extends DataClass {
-    static _all: Order[];
-    static all(): Order[];
-    static _current: Order;
-    static current(): Promise<Order>;
-    orderId: string;
-    dateTime: DateTime;
-    foods: Food[];
-    restaurant: LazyType<Restaurant>;
-    constructor({ orderId, dateTime, foods, restaurant, }: {
-        orderId: string;
-        dateTime: DateTime;
-        foods: Food[];
-        restaurant: LazyType<Restaurant> | null;
-    });
-    addFoods({ foods }: {
-        foods: Food[];
-    }): void;
-    removeFoods({ foods }: {
-        foods: Food[];
-    }): void;
-    placeOrder(): void;
-    description(): {};
-    static _ClassDescriptor: ClassDescriptor<Order>;
-}
-export declare class Restaurant extends DataClass {
-    static _all: Restaurant[];
-    orders: Order[];
-    static all(): Restaurant[];
-    description(): {};
-    createFood(name: string, price: float): Food;
-    createOrder(orderId: string, dateTime: DateTime, foods: Food[]): Promise<Order>;
-    static current(): Promise<Restaurant>;
-    book({ dateTime }: {
-        dateTime?: DateTime;
-    }): void;
-    bookTable({ dateTime, number }: {
-        dateTime?: DateTime;
-        number?: int;
-    }): void;
-    name: string;
-    menu: Food[];
-    rating: int;
-    priceGrade: float;
-    cuisine: string;
-    address: string;
-    constructor({ name, menu, rating, priceGrade, cuisine, address, }: {
-        name: string;
-        menu: Food[];
-        rating: number;
-        priceGrade: number;
-        cuisine: string;
-        address: string;
-    });
-    static _ClassDescriptor: ClassDescriptor<Restaurant>;
-}
-export declare const allDescriptors: ClassDescriptor<import("../dsl-descriptor").GenieObject>[];
-export declare const classDescriptions: string[];
-export declare const examples: ExampleParse[];