migrate to mjs, sub package

tetherto · Aug 30, 2022 · 3d02da9 · 3d02da9
1 parent ea6efc7
commit 3d02da9
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 node_modules/
 yarn-error.log
+
+package/*
diff --git a/build.mjs → build.js b/build.mjs → build.js
diff --git a/package.json b/package.json
@@ -1,17 +1,19 @@
 {
   "name": "fast-text-encoding",
-  "version": "1.0.4",
-  "description": "Fast polyfill for TextEncoder and TextDecoder, only supports utf-8",
+  "version": "0.0.1",
+  "private": "true",
+  "description": "Build package for fast-text-encoding, should not be published",
   "main": "text.min.js",
   "repository": "https://github.com/samthor/fast-text-encoding.git",
   "author": "Sam Thorogood <[email protected]>",
   "license": "Apache-2.0",
   "scripts": {
-    "compile": "node ./build.mjs",
-    "test": "node --test ./test.mjs"
+    "build": "node ./build.js",
+    "test": "node --test ./test.js"
   },
   "devDependencies": {
     "@types/node": "^18.7.13",
     "esbuild": "^0.15.5"
-  }
+  },
+  "type": "module"
 }
diff --git a/package/package.json b/package/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "fast-text-encoding",
+  "version": "1.0.5",
+  "description": "Fast polyfill for TextEncoder and TextDecoder, only supports utf-8",
+  "main": "text.min.js",
+  "repository": "https://github.com/samthor/fast-text-encoding.git",
+  "author": "Sam Thorogood <[email protected]>",
+  "license": "Apache-2.0"
+}
diff --git a/release.sh b/release.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -eu
+
+npm run build
+npm run test
+cp README.md LICENSE text.min.js* package/
+cd package/
+npm version patch
+npm publish --dry-run
diff --git a/test-setup.mjs → test-setup.js b/test-setup.mjs → test-setup.js
diff --git a/test.html b/test.html
@@ -3,43 +3,23 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="stylesheet" href="node_modules/mocha/mocha.css" />
-<script src="node_modules/mocha/mocha.js"></script>
-<script src="node_modules/chai/chai.js"></script>
-<script>
-  window.NativeTextDecoder = window.TextDecoder;
-  window.NativeTextEncoder = window.TextEncoder;
-  window.TextDecoder = null;
-  window.TextEncoder = null;
-</script>
-<script src="text.js"></script>
-<script>
-
-var assert = chai.assert;
-mocha.setup({ ui: 'tdd' });
+<script type="module">
 
-(function() {
-  var pageError = null;
+import {
+  NativeTextEncoder,
+  NativeTextDecoder,
+} from './test-setup.js';
 
-  window.addEventListener('error', function(event) {
-    pageError = event.filename + ':' + event.lineno + ' ' + event.message;
-  });
+import './text.min.js';
 
-  window.addEventListener('load', function() {
-    if (pageError) {
-      suite('page-script-errors', function() {
-        test('no script errors on page', function() {
-          assert.fail(null, null, pageError);
-        });
-      });
-    }
-    mocha.run();
-  });
-})();
+window._NativeTextEncoder = NativeTextEncoder;
+window._NativeTextDecoder = NativeTextDecoder;
 
 </script>
 </head>
 <body>
-<div id="mocha"></div>
-<script src="suite.js"></script>
+
+
+
 </body>
 </html>
diff --git a/test.mjs → test.js b/test.mjs → test.js
@@ -5,12 +5,14 @@
 import {
   NativeTextEncoder,
   NativeTextDecoder,
-} from './test-setup.mjs';
+} from './test-setup.js';
 
-import './text.js';
+import './text.min.js';
+
+import { decodeFallback, encodeFallback } from './src/lowlevel.js';
 
 import test from 'node:test';
-import assert from 'node:assert';
+import * as assert from 'node:assert';
 
 /**
  * @param {boolean} isNative
@@ -106,8 +108,15 @@ export async function tests(isNative, TextEncoder, TextDecoder) {
         assert.deepEqual(dec.decode(buffer), s);
       });
 
+      // Since this is being run in Node, this should work.
       await test('nodejs encodings', () => {
-        const d = new TextDecoder('utf16le');
+        if (typeof window === 'undefined') {
+          new TextDecoder('utf-16le');
+        } else {
+          assert.throws(() => {
+            new TextDecoder('utf-16le');
+          });
+        }
       });
 
     });
@@ -166,3 +175,15 @@ export async function tests(isNative, TextEncoder, TextDecoder) {
 
 await tests(true, NativeTextEncoder, NativeTextDecoder);
 await tests(false, TextEncoder, TextDecoder);
+
+
+
+await test('always lowlevel', () => {
+  const src = 'hello there ƒåcé zing';
+
+  const b = encodeFallback(src);
+  const out = decodeFallback(b);
+
+  assert.equal(src, out);
+});
+