v0.0.1

Author: rjrodger

.gitignore

@@ -23,3 +23,7 @@ trial
 
 test/coverage.html
 
+coverage
+
+package-lock.json
+yarn.lock

README.md

@@ -1,6 +1,10 @@
-# variant-jsonc
-JSONC
+# @jsonic/jsonc (JSONIC variant plugin)
+
+This plugin allows the [Jsonic](https://jsonic.senecajs.org) JSON parser
+to parse [JSONC](https://github.com/microsoft/node-jsonc-parser) format files.
+
+
+
 
-https://github.com/microsoft/node-jsonc-parser
 
 

jsonc.d.ts

@@ -4,5 +4,5 @@ declare type JsoncOptions = {
     disallowComments?: boolean;
 };
 declare function Jsonc(jsonic: Jsonic, options: JsoncOptions): void;
-export { Jsonc, };
-export type { JsoncOptions, };
+export { Jsonc };
+export type { JsoncOptions };

jsonc.js

@@ -1,43 +1,45 @@
-
 import { Jsonic } from 'jsonic'
 
-
 type JsoncOptions = {
   allowTrailingComma?: boolean
   disallowComments?: boolean
 }
 
 function Jsonc(jsonic: Jsonic, options: JsoncOptions) {
-  // TODO: merge these calls
-
   jsonic.options({
-    text: { lex: false },
-    number: { hex: false, oct: false, bin: false, sep: null },
-    string: { chars: '"', multiChars: '', allowUnknown: false, escape: { v: null } },
-    comment: { lex: false },
-    map: { extend: false },
-    lex: { empty: false },
+    text: {
+      lex: false,
+    },
+    number: {
+      hex: false,
+      oct: false,
+      bin: false,
+      sep: null,
+    },
+    string: {
+      chars: '"',
+      multiChars: '',
+      allowUnknown: false,
+      escape: {
+        v: null,
+      },
+    },
+    comment: {
+      lex: true !== options.disallowComments,
+    },
+    map: {
+      extend: false,
+    },
+    lex: {
+      empty: false,
+    },
     rule: {
       finish: false,
-      include: 'json' + (options.allowTrailingComma ? ',comma' : '')
+      include: 'json' + (options.allowTrailingComma ? ',comma' : ''),
     },
   })
-
-  jsonic.options({
-    comment: {
-      lex: true && !options.disallowComments,
-      marker: [
-        { line: true, start: '//', lex: true },
-        { line: false, start: '/' + '*', end: '*' + '/', lex: true },
-      ],
-    }
-  })
 }
 
-export {
-  Jsonc,
-}
+export { Jsonc }
 
-export type {
-  JsoncOptions,
-}
+export type { JsoncOptions }

jsonc.js.map

@@ -1,11 +1,11 @@
 {
   "name": "@jsonic/jsonc",
   "version": "0.0.1",
-  "main": "@jsonic/jsonc.js",
+  "description": "Jsonic plugin for the JSONC variant of JSON.",
+  "main": "jsonc.js",
   "type": "commonjs",
-  "browser": "@jsonic/jsonc.min.js",
-  "types": "@jsonic/jsonc.d.ts",
-  "description": "JSONC",
+  "browser": "jsonc.min.js",
+  "types": "jsonc.d.ts",
   "homepage": "https://github.com/jsonicjs/variant-jsonc",
   "keywords": [
     "pattern",
@@ -17,19 +17,20 @@
   "author": "Richard Rodger (http://richardrodger.com)",
   "repository": {
     "type": "git",
-    "url": "git://github.com/jsonicic/variant-jsonc.git"
+    "url": "git://github.com/jsonicjs/variant-jsonc.git"
   },
   "scripts": {
     "test": "jest --coverage",
     "test-some": "jest -t",
+    "test-watch": "jest --coverage --watchAll",
     "watch": "tsc -w -d",
     "build": "tsc -d && cp jsonc.js jsonc.min.js && browserify -o jsonc.min.js -e jsonc.js -s @JsonicJsonc -im -i assert -p tinyify",
     "prettier": "prettier --write --no-semi --single-quote *.ts test/*.js",
     "clean": "rm -rf node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run test-web && npm run repo-tag && npm publish --registry http://registry.npmjs.org "
+    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run repo-tag && npm publish --registry http://registry.npmjs.org "
   },
   "license": "MIT",
   "files": [
@@ -39,17 +40,15 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@hapi/code": "^8.0.3",
-    "@hapi/lab": "^24.3.2",
-    "@types/jest": "^26.0.24",
+    "@types/jest": "^27.0.1",
     "browserify": "^17.0.0",
     "hapi-lab-shim": "0.0.2",
-    "jest": "^27.0.6",
+    "jest": "^27.1.1",
     "lab-transform-typescript": "^3.0.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "tinyify": "^3.0.0",
-    "ts-jest": "^27.0.4",
-    "typescript": "^4.3.5",
+    "ts-jest": "^27.0.5",
+    "typescript": "^4.4.2",
     "jsonc-parser": "^3.0.0",
     "jsonic": "github:jsonicjs/jsonic#nextgen"
   },

jsonc.min.js

@@ -4,7 +4,6 @@
     "esModuleInterop": true,
     "module": "commonjs",
     "noEmitOnError": true,
-    "noImplicitAny": true,
     "resolveJsonModule": true,
     "sourceMap": true,
     "strict": true,