ctx-core 6.4.4 → 6.5.0

package/all/uuid/index.d.ts

@@ -3,5 +3,6 @@ export {
 	uuid_ as _uuid,
 	uuid_ as uuid,
 }
-export declare function short_uuid_(uuid?:string):string
+export declare function short_uuid_():string
+export declare function uuid__compact(uuid:string):string
 export declare function polyfill_uuid_(uuid?:string):string

package/all/uuid/index.js

@@ -5,21 +5,31 @@ export {
 	uuid_ as _uuid,
 	uuid_ as uuid,
 }
+export function short_uuid_() {
+	let uuid = crypto.randomUUID()
+	let str = ''
+	for (let i = 0; i < uuid.length; i += 2) {
+		if (uuid[i] === '-') ++i
+		str += String.fromCharCode(parseInt(uuid.slice(i, i + 2), 16))
+	}
+	return btoa(str).slice(0, 22)
+}
 /**
- * @param {string}[uuid]
+ * @param {string}uuid
  * @returns {string}
  * @private
  */
-export function short_uuid_(uuid) {
-	uuid = (uuid ?? crypto.randomUUID()).replaceAll('-', '')
+export function uuid__compact(uuid) {
 	let str = ''
-	for (let i = 0; i < uuid.length; i += 2)
+	for (let i = 0; i < uuid.length; i += 2) {
+		if (uuid[i] === '-') ++i
 		str += String.fromCharCode(parseInt(uuid.slice(i, i + 2), 16))
-	return btoa(str).replace('==', '')
+	}
+	return btoa(str).slice(0, 22)
 }
 /**
  * @returns {string}
- * @see {@link https://gist.github.com/LeverOne/1308368}
+ * @see {https://gist.github.com/LeverOne/1308368}
  * @private
  */
 export function polyfill_uuid_() {

package/all/uuid/index.test.ts

@@ -1,6 +1,6 @@
 import { test } from 'uvu'
 import { equal } from 'uvu/assert'
-import { polyfill_uuid_, short_uuid_, uuid_ } from './index.js'
+import { polyfill_uuid_, short_uuid_, uuid_, uuid__compact } from './index.js'
 test('uuid_', ()=>{
 	equal(
 		uuid_().split('-').map(seg=>seg.length),
@@ -8,9 +8,11 @@ test('uuid_', ()=>{
 })
 test('short_uuid_', ()=>{
 	equal(short_uuid_().length, 22)
+})
+test('uuid__compact', ()=>{
 	const uuid = '8a88c23d-4a69-46ac-b975-1ab4590a470c'
 	const expected_short_uuid = 'iojCPUppRqy5dRq0WQpHDA'
-	equal(short_uuid_(uuid), expected_short_uuid)
+	equal(uuid__compact(uuid), expected_short_uuid)
 	// verify the isomorphic solution is the same as nodejs
 	equal(
 		Buffer
@@ -18,6 +20,7 @@ test('short_uuid_', ()=>{
 			.toString('base64')
 			.replace(/==$/, ''),
 		expected_short_uuid)
+	equal(uuid__compact('8a88c23d4a6946acb9751ab4590a470c'), expected_short_uuid)
 })
 test('polyfill_uuid_', ()=>{
 	equal(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "6.4.4",
+  "version": "6.5.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -300,7 +300,7 @@
     "@ctx-core/preprocess": "^0.1.2",
     "@size-limit/preset-small-lib": "^11.0.2",
     "@types/jsdom": "^21.1.6",
-    "@types/node": "^20.11.19",
+    "@types/node": "^20.11.20",
     "@types/sinon": "^17.0.3",
     "c8": "^9.1.0",
     "check-dts": "^0.7.2",
@@ -389,18 +389,25 @@
       "limit": "589 B"
     },
     {
-      "name": "uuid",
+      "name": "uuid_",
       "import": {
         "./uuid": "{ uuid_ }"
       },
-      "limit": "39 B"
+      "limit": "41 B"
     },
     {
-      "name": "short uuid",
+      "name": "short_uuid_",
       "import": {
         "./uuid": "{ short_uuid_ }"
       },
-      "limit": "116 B"
+      "limit": "113 B"
+    },
+    {
+      "name": "uuid__compact",
+      "import": {
+        "./uuid": "{ uuid__compact }"
+      },
+      "limit": "107 B"
     }
   ],
   "scripts": {