warscript 0.0.1-dev.ba37a78 → 0.0.1-dev.bb34489

package/string.d.ts

@@ -59,6 +59,22 @@ declare global {
         function toNumber(string: string): number;
     }
 }
+declare global {
+    namespace string {
+        /**
+         * Returns the index within the string of the first occurrence of the specified substring, starting from the specified `startIndex`,
+         * or -1 if the string does not contain such substring.
+         */
+        function indexOf(string: string, substring: string, startIndex?: number): number;
+    }
+    interface String {
+        /**
+         * Returns the index within this string of the first occurrence of the specified substring, starting from the specified `startIndex`,
+         * or -1 if the string does not contain such substring.
+         */
+        indexOf(substring: string, startIndex?: number): number;
+    }
+}
 declare global {
     interface String {
         /**
@@ -103,4 +119,18 @@ declare global {
         function isNotBlank(string: string): boolean;
     }
 }
+declare global {
+    namespace string {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        function count(string: string, predicate: (char: string) => boolean): number;
+    }
+    interface String {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        count(predicate: (char: string) => boolean): number;
+    }
+}
 export {};

package/string.lua

@@ -2,6 +2,7 @@ local ____exports = {}
 local ____error = _G.error
 local tonumber = _G.tonumber
 local match = string.match
+local find = string.find
 local sub = string.sub
 _G.string.removePrefix = function(____string, prefix)
     local prefixLength = #prefix
@@ -17,6 +18,10 @@ end
 _G.string.toNumber = function(____string)
     return tonumber(____string) or ____error(("'" .. ____string) .. "' is not a valid representation of a number.")
 end
+_G.string.indexOf = function(____string, substring, startIndex)
+    local index = find(____string, substring, (startIndex or 0) + 1, true)
+    return (index or 0) - 1
+end
 _G.string.indexOfLast = function(____string, predicate)
     for i = #____string, 1, -1 do
         if predicate(sub(____string, i, i)) then
@@ -31,4 +36,13 @@ end
 _G.string.isNotBlank = function(____string)
     return (match(____string, "^%s*$")) == nil
 end
+_G.string.count = function(____string, predicate)
+    local result = 0
+    for i = 1, #____string do
+        if predicate(sub(____string, i, i)) then
+            result = result + 1
+        end
+    end
+    return result
+end
 return ____exports

package/util/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export interface Stream<T> {
     toArray(): T[];

package/utility/arrays.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { TupleOf } from "./types";
 export declare const emptyArray: <T>() => readonly T[];
 export declare const joinToString: <T>(array: readonly T[], separator: string, transform?: (element: T) => string) => string;
-export declare const arrayOfNotNull: <T>(...elements: readonly (T | null | undefined)[]) => T[];
+export declare const arrayOfNotNull: <T>(...elements: readonly (T | undefined | null)[]) => T[];
 export declare const array: <T, N extends number>(length: N, initialize: (index: number) => T) => TupleOf<T, N>;
 export declare const toLuaSet: <T extends AnyNotNil>(array: readonly T[]) => LuaSet<T>;
-export declare const forEach: <T, Args extends any[]>(array: readonly T[], consumerOrKey: KeysOfType<T, (this: T, ...args: Args) => void> | ((value: T, ...args: Args) => void), ...args: Args) => void;
+export declare const forEach: <T, Args extends any[]>(array: readonly T[], consumerOrKey: ((value: T, ...args: Args) => void) | KeysOfType<T, (this: T, ...args: Args) => void>, ...args: Args) => void;
 export declare const all: {
     <T>(array: readonly T[], transform: (value: T) => boolean): boolean;
     <T>(array: readonly T[], key: KeysOfType<T, boolean>): boolean;
@@ -45,7 +44,7 @@ export declare const max: (array: readonly number[]) => number;
 export declare const intersperse: <T>(array: readonly T[], delimiter: T) => T[];
 export declare const zip: <T, R, V>(array: readonly T[], otherArray: readonly R[], transform: (value: T, otherValue: R) => V) => V[];
 export declare const chunked: <T>(array: readonly T[], size: number) => T[][];
-export declare const sortBy: <T, R>(array: T[], selector: KeysOfType<T, R> | ((value: T) => R)) => void;
+export declare const sortBy: <T, R>(array: T[], selector: ((value: T) => R) | KeysOfType<T, R>) => void;
 export declare const sortedBy: {
     <T, R>(array: readonly T[], selector: (value: T) => R): T[];
     <T, K extends keyof T>(array: readonly T[], key: K): T[];

package/utility/bit-set.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="@warscript/language-extensions" />
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 interface IBitSet<T extends number> {
     readonly has: LuaBitwiseAndEqualsRightMethod<T>;

package/utility/linked-set.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 type IteratorState<T extends AnyNotNil> = {
     t: LuaMap<T, T>;
@@ -46,5 +45,5 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LinkedSet<T>;
-export declare const linkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | null | undefined)[]) => LinkedSet<T>;
+export declare const linkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LinkedSet<T>;
 export {};

package/utility/lua-maps.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
-export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 2 | 1 | 22 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 27 | 31 | 40 | 30 | 32 | 23 | 24 | 25 | 26 | 28 | 29 | 33 | 34 | 35 | 36 | 37 | 38 | 39>>) => LuaMap<K, V>;
+export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40>>) => LuaMap<K, V>;
 export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: LuaMap<K, V>) => LuaMap<V, K>;
 export declare const mapValues: <K extends AnyNotNil, V1, V2>(luaMap: LuaMap<K, V1>, transform: (value: V1) => V2) => LuaMap<K, V2>;

package/utility/lua-sets.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
-export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | null | undefined)[]) => LuaSet<T>;
+export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;
 export declare const luaSetIntersection: <T extends AnyNotNil>(firstLuaSet: ReadonlyLuaSet<T>, secondLuaSet: ReadonlyLuaSet<T>) => LuaSet<T>;
 export declare const luaSetContainsAnyOf: <T extends AnyNotNil>(luaSet: ReadonlyLuaSet<T>, ...elements: readonly T[]) => boolean;

package/utility/types.d.ts

@@ -12,14 +12,14 @@ export type ValueOf<T> = T[keyof T];
 export type EntryOf<T> = ValueOf<{
     [K in keyof T]: [K, T[K]];
 }>;
-export type MutableKeys<T extends object> = {
+export type MutableKeys<T extends object> = keyof T & {
     [P in keyof T]-?: IfEquals<{
         [Q in P]: T[P];
     }, {
         -readonly [Q in P]: T[P];
     }, P>;
 }[keyof T];
-export type ReadonlyKeys<T extends object> = {
+export type ReadonlyKeys<T extends object> = keyof T & {
     [P in keyof T]-?: IfEquals<{
         [Q in P]: T[P];
     }, {