circuitscript 0.0.22 → 0.0.25

package/package.json

@@ -1,16 +1,28 @@
 {
     "name": "circuitscript",
-    "version": "0.0.22",
+    "version": "0.0.25",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
         "node": ">=16.0"
     },
-    "type": "module",
-    "main": "./build/src/main.js",
+    "main": "./dist/cjs/index.js",
+    "module": "./dist/esm/index.mjs",
+    "types": "./dist/types/index.d.ts",
     "bin": {
-        "circuitscript": "./build/src/main.js"
+        "circuitscript": "./dist/cjs/main.js"
     },
+    "exports": {
+        ".": {
+            "require": "./dist/cjs/index.js",
+            "import": "./dist/esm/index.mjs"
+        }
+    },
+    "files": [
+        "dist",
+        "fonts",
+        "libs"
+    ],
     "devDependencies": {
         "@types/figlet": "^1.5.8",
         "@types/jest": "~29.5",
@@ -18,6 +30,7 @@
         "@types/svgdom": "^0.1.2",
         "@typescript-eslint/eslint-plugin": "~5.59",
         "@typescript-eslint/parser": "~5.59",
+        "antlr4ng-cli": "^2.0.0",
         "eslint": "~8.38",
         "eslint-config-prettier": "~8.8",
         "eslint-plugin-jest": "~27.2",
@@ -27,37 +40,47 @@
         "source-map-support": "^0.5.21",
         "ts-api-utils": "~0.0.44",
         "ts-jest": "~29.1",
+        "ts2mjs": "^3.0.0",
         "typescript": "^5.4.5"
     },
     "scripts": {
         "start": "node build/src/main.js",
-        "clean": "rimraf coverage build tmp",
-        "build": "tsc -p tsconfig.json",
-        "build:watch": "tsc -w -p tsconfig.json",
-        "build:release": "npm run clean && tsc -p tsconfig.release.json",
-        "prebuild": "npm run lint",
+        "clean": "rimraf coverage build tmp dist",
+        "build": "npm run build:cjs || npm run build:esm",
+        "build:cjs": "tsc -p tsconfig.cjs.json",
+        "build:release:cjs": "tsc -p tsconfig.release.cjs.json",
+        "build:esm": "tsc -p tsconfig.esm.json || npm run rename:esm",
+        "build:release:esm": "tsc -p tsconfig.release.esm.json || npm run rename:esm",
+        "rename:esm": "npx ts2mjs ./dist/esm && rm -rf ./dist/esm/*.js && rm -rf ./dist/esm/**/*.js",
+        "build:watch": "tsc -w -p tsconfig.esm.json",
+        "build:watch:cjs": "tsc -w -p tsconfig.cjs.json",
+        "build:release": "npm run clean && npm run build:release:cjs || npm run build:release:esm",
+        "prebuild": "npm run lint || true",
         "lint": "eslint . --ext .ts --ext .mts",
         "test": "jest",
         "test-coverage": "jest --coverage",
         "prettier": "prettier --config .prettierrc --write .",
         "test:watch": "jest --watch",
         "antlr": "antlr4 -Dlanguage=TypeScript ./src/antlr/CircuitScript.g4 -no-listener -visitor",
+        "antlr4ng": "npx antlr4ng -Dlanguage=TypeScript -o src/antlr -visitor -no-listener -Xexact-output-dir src/antlr/CircuitScript.g4",
         "profile": "node --prof build/src/main.js examples/example_garden_pump.cst",
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
-        "server": "node server.js"
+        "server": "node server.js",
+        "pack-local": "npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-vscode/client; cp circuitscript-install.tgz ../circuitscript-vscode/server"
     },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
     "dependencies": {
-        "@dagrejs/graphlib": "^2.1.13",
-        "@flatten-js/core": "^1.4.3",
-        "@svgdotjs/svg.js": "^3.2.0",
-        "antlr4": "^4.13.0",
+        "@dagrejs/graphlib": "2.1.13",
+        "@flatten-js/core": "1.5.5",
+        "@svgdotjs/svg.js": "3.2.0",
+        "antlr4ng": "^3.0.4",
         "commander": "^11.1.0",
         "express": "^4.18.2",
         "figlet": "^1.7.0",
         "lodash": "^4.17.21",
-        "svgdom": "^0.1.14",
+        "svgdom": "0.1.14",
+        "this-file": "^2.0.3",
         "tslib": "~2.5",
         "ws": "^8.14.2"
     },

package/.editorconfig

@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-insert_final_newline = false
-trim_trailing_whitespace = false
-
-[*.{js,json,ts,mts,yml,yaml}]
-indent_size = 2
-indent_style = space

package/.eslintignore

@@ -1 +0,0 @@
-/**/*.js

package/.eslintrc.json

@@ -1,27 +0,0 @@
-{
-  "env": {
-    "browser": false,
-    "es6": true,
-    "node": true
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "tsconfig.json",
-    "sourceType": "module",
-    "ecmaVersion": 2020
-  },
-  "plugins": ["@typescript-eslint", "jest"],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:jest/recommended",
-    "prettier"
-  ],
-  "rules": {
-    // The following rule is enabled only to supplement the inline suppression
-    // examples, and because it is not a recommended rule, you should either
-    // disable it, or understand what it enforces.
-    // https://typescript-eslint.io/rules/explicit-function-return-type/
-    "@typescript-eslint/explicit-function-return-type": "warn"
-  }
-}

package/.gitlab-ci.yml

@@ -1,81 +0,0 @@
-image: node:18
-
-# variables:
-#   ARTIFACT_DOWNLOAD_ATTEMPTS: 2 # Number of retries for restoring saved artifacts.
-#   FORCE_COLOR: '1' # Whether to force colour output in compatible tooling.
-#   GET_SOURCES_ATTEMPTS: 2 # Number of retries for git commands.
-#   GIT_STRATEGY: fetch # How to pull submodules.
-#   GIT_SUBMODULE_STRATEGY: recursive # How to treat nested git submodules.
-#   RESTORE_CACHE_ATTEMPTS: 2 # Number of retries for restoring cached files.
-
-stages:
-  - prepare
-  - test_jest
-  - test_build
-  - publish
-
-.common_rules:
-  rules:
-    - if: $CI_COMMIT_TAG
-    # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# Installs all dependencies.
-install:
-  stage: prepare
-  interruptible: true
-  retry: 1
-  dependencies: []
-  artifacts:
-    name: 'deps_$CI_COMMIT_REF_SLUG'
-    paths:
-      - node_modules/
-    when: on_success
-    expire_in: 12h
-  script:
-    - echo $CI_COMMIT_BRANCH
-    - echo $CI_COMMIT_TAG
-    - echo $CI_PIPELINE_SOURCE
-    - echo $CI_COMMIT_REF_NAME
-    - npm install --no-progress --no-audit --no-fund --verbose
-  rules:
-    - !reference [.common_rules, rules]
-
-test_jest:
-  stage: test_jest
-  interruptible: true
-  retry: 1
-  dependencies:
-    - install
-  script:
-    - npm run build:release || true
-    - npm run test
-  rules:
-    - !reference [.common_rules, rules]
-
-test_build:
-  stage: test_build
-  interruptible: true
-  retry: 1
-  dependencies:
-    - install
-  script:
-    - npm run build:release || true
-    - ls
-    - ls build
-    - node build/src/main.js
-  rules:
-    - !reference [.common_rules, rules]
-
-# Publishes the package to npm.
-publish:
-  stage: publish
-  interruptible: false
-  dependencies:
-    - install
-  script:
-    - npm config set -- '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
-    - npm run build:release || true
-    - npm publish --verbose
-  resource_group: 'deployment-$CI_COMMIT_REF_SLUG'
-  rules:
-    - !reference [.common_rules, rules]

package/.prettierignore

@@ -1,8 +0,0 @@
-*.md
-*.json
-.prettierrc
-
-build/*
-src/antlr/CircuitScriptLexer.ts
-src/antlr/CircuitScriptParser.ts
-src/antlr/CircuitScriptVisitor.ts

package/.prettierrc

@@ -1,16 +0,0 @@
-{
-    "singleQuote": true,
-    "trailingComma": "all",
-    "tabWidth": 4,
-    "semi": true,
-    "overrides": [
-        {
-            "files": [
-                "*.ts"
-            ],
-            "options": {
-                "parser": "typescript"
-            }
-        }
-    ]
-}