@naanlang/naan 1.0.16 → 1.1.0

package/lib/env_node.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2023 by Richard C. Zulch
+ * Copyright (c) 2017-2024 by Richard C. Zulch
  *
  */
 
@@ -20,6 +20,10 @@
  * Currently defined options are:
  *  {
  *      replDisable:    <boolean>               // disable REPL and just respond to textCommand in API
+ *      noWelcome:      <boolean>               // suppress the welcome banner/messages
+ *      state:          <object>                // saved state to load
+ *      require:        <function>              // use the specified require function
+ *      import:         <function>              // use the specified import function
  *  }
  *
  */
@@ -29,6 +33,14 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     "use strict";
     /*jshint -W024 */
     var undefined;
+ 
+    //
+    // Persistent
+    //
+
+    var
+        kStateFirstVersion = 200,                                           // increment when losing backwards compatbility
+        kStateCurrentVersion = 200;                                         // increment when adding features
 
     //
     // Initialization
@@ -48,7 +60,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     var useConsoleOut = false;
     if (outEnable && process.env["RUNKIT_ENDPOINT_URL"])
         useConsoleOut = true;                                               // use console.log for output in RunKit
-
+    var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
+    var prefs = { };
 
     //==========================================================================
     // API
@@ -58,6 +71,10 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         naanlib.js.r = req;
     };
 
+    this.setImport = function setImport(imp) {                              // override import function
+        naanlib.js.i = imp;
+    };
+
     this.setDirectory = function setDirectory(path) {                       // override base directory
         naanlib.js.d = path;
     };
@@ -94,11 +111,11 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     
     if (!options.replDisable)
     {
-        replServer = repl.start({ prompt: 'Naan> ', eval: myEval});
+        replServer = repl.start({ prompt: '', eval: myEval});
     
-        replServer.on('line', function(cmd) {                                  // process raw command line
+        replServer.on('line', function(cmd) {                               // process raw command line
             if (cmd.charAt(0) != ".") {
-                textToRemoteTerm(cmd);
+                textToRemoteTerm("\x1b[90m\x1b[3m".concat(cmd, "\x1b[0m\n"));
                 naanlib.textLine(cmd + "\n");
             }
         });
@@ -139,7 +156,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
             if (termops)
             {
                 setTimeout(function () {
-                    termops.debugtext(text, level);
+                    if (termops)                                            // avoid crashing if it went away during delay
+                        termops.debugtext(text, level);
                 }, 1);
             }
         } else if (outEnable) {
@@ -237,7 +255,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         else if (msg.id == "keyline")
         {                                                                   // typing from remote terminal
             setTimeout(function () {
-                process.stdout.write(msg.text + "\r\n");
+                process.stdout.write("\x1b[90m\x1b[3m".concat(msg.text.trim(), "\x1b[0m\r\n"));
                 outEnable = true;
                 naanlib.textLine(msg.text);                                 // keyboard text from terminal
             }, 1);
@@ -288,14 +306,85 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         }
     }, 1000);
     
+
+    //==========================================================================
+    // State load/save
+    //--------------------------------------------------------------------------
+     
+    // SavePref
+    //
+    // Save a persistent preference object that can be retrieved in the future.
+    //
+    this.SavePref = function SavePref(key, value) {
+        return (prefs[key] = value);
+    };
+ 
+    // LoadPref
+    //
+    // Load a previously-saved preference object for future retrieval.
+    //
+    this.LoadPref = function LoadPref(key) {
+        return (prefs[key]);
+    };
+
+    // Working
+    //
+    // Note that the application is working, so it is safe to save state.
+    //
+    this.Working = function Working() {
+        dontSaveUntilWorking = false;
+    };
+
+    // MakeState
+    //
+    // Save our state into a new object.
+    //
+    this.MakeState = function MakeState() {
+        if (dontSaveUntilWorking)
+            return (false);                                                 // didn't get far enough to call Working()
+        var statedoc = {};
+        statedoc.curversion = kStateCurrentVersion;
+        statedoc.firstver = kStateFirstVersion;
+        statedoc.date = new Date().toISOString();
+        statedoc.prefs = prefs;
+        statedoc.naan = naanlib.saveState(true);                            // true to optimize, which is a bit slower
+        return (statedoc);
+    };
+ 
+    // loadState
+    //
+    // Load our state from an object.
+    //
+    function loadState(statedoc) {
+        dontSaveUntilWorking = true;                                        // make sure we don't store bad state
+        if (typeof(statedoc) != "object" || typeof(statedoc.naan) != "string"
+            || statedoc.firstver > kStateCurrentVersion
+            || statedoc.curversion < kStateFirstVersion)
+        {
+            return (false);
+        }
+        if (typeof(statedoc.prefs) == "object")
+            prefs = statedoc.prefs;
+        return (statedoc.naan);
+    }
+
     
     //==========================================================================
     // Start the Naan Interpreter
     //--------------------------------------------------------------------------
+    if (options.require)
+        naanlib.js.r = options.require;
+    if (options.import)
+        naanlib.js.i = options.import;
     var startOptions = {};
     if (options.noWelcome)
         startOptions.noWelcome = true;
-    naanlib.banner();
+    else
+        naanlib.banner();
+    if (options.state)
+        startOptions.state = loadState(options.state);
+    if (options.cmd)
+        startOptions.cmd = options.cmd;
     naanlib.start(startOptions);
 };
 

package/lib/env_nodeworker.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -28,6 +28,18 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
         cbReady(naancon);
     });
     
+    if (process.execArgv.includes("--inspect-brk"))
+    {
+        import("node:inspector").then(
+            function (inspector) {
+                inspector.open();
+                inspector.waitForDebugger();
+                /*jshint debug:true */
+                debugger;
+            }
+        );
+    }
+    
     /*
      * NaanControllerNodeWorker
      *
@@ -59,7 +71,11 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
         this.setRequire = function setRequire(req) {                        // override require function
             naanlib.js.r = req;
         };
-    
+
+        this.setImport = function setImport(imp) {                          // override import function
+            naanlib.js.i = imp;
+        };
+
         this.setDirectory = function setDirectory(path) {                   // override base directory
             naanlib.js.d = path;
         };
@@ -140,7 +156,7 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                 if (msg.altcmd)
                     naanlib.textLine(msg.altcmd);
                 /*
-                 ### already started ###
+                 ### already started by textLine() if not before ###
                 naanlib.start({
                     state: msg.state,
                     cmd: msg.altcmd
@@ -161,10 +177,12 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
             }
         });
         
+        naanlib.banner();
+        naanlib.start(false);                                               // start explicitly
+
         msgPort.postMessage({
             id: "loaded"                                                    // initialization complete
         });
-        naanlib.banner();
     }
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.0.16",
+    "version": "1.1.0",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/plugins/serviceAws/aws/lambda_rest_index.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2023 by Richard C. Zulch
  *
  */
 
@@ -71,6 +71,10 @@ exports.handler = function awsHandler(event, context, callback) {
         naanlib.js.r = req;
     };
 
+    this.setImport = function setImport(imp) {                              // override import function
+        naanlib.js.i = imp;
+    };
+
     this.setDirectory = function setDirectory(path) {                       // override base directory
         naanlib.js.d = path;
     };

package/plugins/serviceAws/dbt_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -318,7 +318,7 @@ closure dawsTable(database, path, tableOptions, local table) {
     //
     // For browsers, convert a ReadableStream to an array buffer.
     //
-    function readableStreamToArrayBuffer(stream, local result, reader, error, data, chunk) {
+    closure readableStreamToArrayBuffer(stream, local result, reader, error, data, chunk) {
         result = xnew(js.w.Uint8Array, 0)
         reader = stream.getReader()
         loop {

package/plugins/serviceAws/psm_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -202,7 +202,7 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
         info = {
             classID: "AWS S3"
             type: "AWS S3 bucket"
-            services: ["DBT", "FS"]
+            services: ["NideDB", "NideFS"]
         }
         `(error, creds) = connector.vault.accessResource(resID)
         if creds {

package/test/test_01_core.nlg

@@ -616,12 +616,12 @@ RegisterTestCategory("core", [
     ["oo;", "{ true: a, 0.3333333333333333: b }"],
 
     //
-    // object getters
+    // object getters/setters
     //
     
     [ "oo=new(object);", "Object{0}" ],
-    [ "oo['..prop'] = function(value) { oo.value };>", "(function lambda (value) (`. oo value))" ],
-    [ "oo['.=prop'] = function(value) { oo.value = value };>", "(function lambda (value) (Lib::set\\. oo (`` value) value))" ],
+    [ "oo@['..prop'] = function() { oo.value };>", "(function lambda false (`. oo value))" ],
+    [ "oo@['.=prop'] = function(value) { oo.value = value };>", "(function lambda (value) (Lib::set\\. oo (`` value) value))" ],
     [ "oo.prop = 8;", "8" ],
     [ "oo.prop;", "8" ],
     [ "oo['prop'] = 9;", "9" ],
@@ -633,8 +633,34 @@ RegisterTestCategory("core", [
     [ "xset(oo, 'prop', 11);", "11" ],
     [ "oo.prop;", "11" ],
     [ "oo.value;", "10" ],
-    [ "oo.*;", '("..prop", ".=prop", "value", "prop")' ],
+    [ "oo.*;", '("value", "prop")' ],
 
+    //
+    // object hierarchy
+    //
+
+    [ "oo=new(object);", "Object{0}" ],
+    [ "op=new(object);", "Object{0}" ],
+    [ "oc=new(object);", "Object{0}" ],
+    [ "oo@['.class'] = oc;", "Object{0}" ],
+    [ "oc@['.parent'] = op;", "Object{0}" ],
+    [ "op.print = function (x) { print(self.id) };>", "(function lambda (x) (print (`. self id)))" ],
+    [ "oo.id = `oo;", "oo" ],
+    [ "oc.id = `oc;", "oc" ],
+    [ "op.id = `op;", "op" ],
+    [ "oo.*", '("id")' ],
+    [ "oc.*", '("id")' ],
+    [ "op.*", '("print", "id")' ],
+    [ "oo.print()", "oo|oo" ],
+
+    [ "op@['..prop'] = function() { self.value };>", "(function lambda false (`. self value))" ],
+    [ "oc@['.=prop'] = function(value) { self.value = value };>", "(function lambda (value) (Lib::set\\. self (`` value) value))" ],
+    [ "op.prop = op55;", "op55" ],
+    [ "oo.prop;", "false" ],
+    [ "op.prop;", "op55" ],
+    [ "oo.prop = oo11;", "oo11" ],
+    [ "oo.prop;", "oo11" ],
+    [ "oc.prop;", "false" ],
 
     //
     // object hooks