ctx-core 5.28.1 → 5.30.0

package/all/rmemo/index.d.ts

@@ -5,7 +5,9 @@ export declare function memosig_<val_T, E = unknown>(def:memo_def_T<val_T, E>):s
 export declare function lock_memosig_<val_T, E = unknown>(def:memo_def_T<val_T, E>):sig_T<val_T, E>
 export declare function memo__bind<A extends unknown[], R, E = unknown>(
 	fn:(...arg_a:A)=>R
-):((...arg_a:A)=>R)&{
+):memo__bind_T<A, R, E>
+export type memo__bind_T<A extends unknown[], R, E = unknown> =
+	((...arg_a:A)=>R)&{
 	memo_<val_T>(def:memo_def_T<val_T, E>):memo_T<val_T>
 }
 export declare function rmemo__on<val_T, E = unknown>(rmemo:rmemo_T<val_T, E>, off_fn?:(rmemo:rmemo_T<val_T, E>)=>unknown):void

package/all/url__join/index.d.ts

@@ -1,5 +1,5 @@
-import type { url_segment_T } from '../url_segment/index.js'
-export declare function url__join(url_segment_a:url_segment_T[]):string
+import type { nested_url_segment_a_T } from '../url_segment/index.js'
+export declare function url__join(...url_segment_a:nested_url_segment_a_T):string
 export {
 	url__join as join_url,
 }

package/all/url__join/index.js

@@ -1,24 +1,28 @@
 /// <reference types="../index.d.ts" />
 /**
- * @param {url_segment_T[]}url_segment_a
+ * @param {nested_url_segment_a_T}url_segment_a
  * @returns {string}
  */
-export function url__join(url_segment_a) {
-	return url_segment_a.reduce((
-		url,
-		url_segment
-	)=>{
-		const url_segment_str = url_segment.toString()
-		if (~[
-			'/',
-			'?',
-			'&'
-		].indexOf(url_segment_str.slice(0, 1))) {
-			return `${url}${url_segment_str}`
-		} else {
-			return `${url}/${url_segment_str}`
-		}
-	}, '')
+export function url__join(...url_segment_a) {
+	let url = ''
+	let in_query = 0
+	for (let url_segment of url_segment_a.flat(Infinity)) {
+		let url_segment_str = '' + url_segment
+		url += (
+			~[
+				'/',
+				'?',
+				'&'
+			].indexOf(url_segment_str[0])
+			|| (!url && url_segment_str.includes('://'))
+				? url_segment_str
+				: in_query
+					? '&' + url_segment_str
+					: '/' + url_segment_str
+		)
+		if (url_segment_str.includes('?')) in_query = 1
+	}
+	return url
 }
 export {
 	url__join as join_url,

package/all/url__join/index.test.ts

@@ -0,0 +1,27 @@
+import { test } from 'uvu'
+import { equal } from 'uvu/assert'
+import { url__join } from './index.js'
+test('url__join', ()=>{
+	equal(
+		url__join('foo', 'bar', 'baz'),
+		'/foo/bar/baz')
+	equal(
+		url__join(['foo', 'bar', 'baz']),
+		'/foo/bar/baz')
+	equal(
+		url__join('foo', ['bar', 'baz']),
+		'/foo/bar/baz')
+	equal(
+		url__join(['foo', ['bar', 'baz']]),
+		'/foo/bar/baz')
+	equal(
+		url__join(['foo', ['bar', 'baz', ['?id=1', '&something=else']]]),
+		'/foo/bar/baz?id=1&something=else')
+	equal(
+		url__join(['foo', ['bar', 'baz', ['?id=1', 'something=else']]]),
+		'/foo/bar/baz?id=1&something=else')
+	equal(
+		url__join(['http://localhost/foo/bar/baz?id=1', [['something=else']]]),
+		'http://localhost/foo/bar/baz?id=1&something=else')
+})
+test.run()

package/all/url_segment/index.d.ts

@@ -1,2 +1,4 @@
 export declare type url_segment_T = string|number|boolean
 export declare type urlSegmentT = url_segment_T
+export interface nested_url_segment_a_T extends Array<nested_url_segment_a_T | url_segment_T> {
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "5.28.1",
+  "version": "5.30.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -137,7 +137,7 @@
     "@arethetypeswrong/cli": "^0.13.6",
     "@ctx-core/preprocess": "^0.1.1",
     "@size-limit/preset-small-lib": "^11.0.2",
-    "@types/node": "^20.11.5",
+    "@types/node": "^20.11.6",
     "@types/sinon": "^17.0.3",
     "c8": "^9.1.0",
     "check-dts": "^0.7.2",